From c4633fd861196c82ac84915ff8f6f0b6e2d4a46d Mon Sep 17 00:00:00 2001 From: Mirko Bonadei Date: Fri, 10 Apr 2020 23:25:43 +0200 Subject: [PATCH] Remove the version of Port::AddrAddress without a URL parameter. This version of the method is deprecated in favor of the one that takes an url parameter. Bug: webrtc:10198 Change-Id: I7614b9cb98217663b0e2fbf1785ae1fb1484beec Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/173333 Commit-Queue: Mirko Bonadei Reviewed-by: Harald Alvestrand Cr-Commit-Position: refs/heads/master@{#31068} --- p2p/base/port.cc | 14 -------------- p2p/base/port.h | 13 ------------- 2 files changed, 27 deletions(-) diff --git a/p2p/base/port.cc b/p2p/base/port.cc index 0f2b2c668b..035d3d4bb3 100644 --- a/p2p/base/port.cc +++ b/p2p/base/port.cc @@ -254,20 +254,6 @@ Connection* Port::GetConnection(const rtc::SocketAddress& remote_addr) { return NULL; } -void Port::AddAddress(const rtc::SocketAddress& address, - const rtc::SocketAddress& base_address, - const rtc::SocketAddress& related_address, - const std::string& protocol, - const std::string& relay_protocol, - const std::string& tcptype, - const std::string& type, - uint32_t type_preference, - uint32_t relay_preference, - bool is_final) { - AddAddress(address, base_address, related_address, protocol, relay_protocol, - tcptype, type, type_preference, relay_preference, "", is_final); -} - void Port::AddAddress(const rtc::SocketAddress& address, const rtc::SocketAddress& base_address, const rtc::SocketAddress& related_address, diff --git a/p2p/base/port.h b/p2p/base/port.h index bf1c041423..893e80b20f 100644 --- a/p2p/base/port.h +++ b/p2p/base/port.h @@ -370,19 +370,6 @@ class Port : public PortInterface, void set_type(const std::string& type) { type_ = type; } - // Deprecated. Use the AddAddress() method below with "url" instead. - // TODO(zhihuang): Remove this after downstream applications stop using it. - void AddAddress(const rtc::SocketAddress& address, - const rtc::SocketAddress& base_address, - const rtc::SocketAddress& related_address, - const std::string& protocol, - const std::string& relay_protocol, - const std::string& tcptype, - const std::string& type, - uint32_t type_preference, - uint32_t relay_preference, - bool is_final); - void AddAddress(const rtc::SocketAddress& address, const rtc::SocketAddress& base_address, const rtc::SocketAddress& related_address,