diff --git a/p2p/base/port.h b/p2p/base/port.h index ff7ddf99df..c0a3b567ce 100644 --- a/p2p/base/port.h +++ b/p2p/base/port.h @@ -193,46 +193,6 @@ class RTC_EXPORT Port : public PortInterface, public sigslot::has_slots<> { const webrtc::FieldTrialsView* field_trials = nullptr, bool shared_socket = false); - // // TODO: bugs.webrtc.org/15846 - Remove. - [[deprecated("Use IceCandidateType version")]] Port( - webrtc::TaskQueueBase* thread, - absl::string_view type ABSL_ATTRIBUTE_LIFETIME_BOUND, - rtc::PacketSocketFactory* factory, - const rtc::Network* network, - uint16_t min_port, - uint16_t max_port, - absl::string_view username_fragment, - absl::string_view password, - const webrtc::FieldTrialsView* field_trials = nullptr, - bool shared_socket = false) - : Port(thread, - PortTypeToIceCandidateType(type), - factory, - network, - min_port, - max_port, - username_fragment, - password, - field_trials, - shared_socket) {} - - // // TODO: bugs.webrtc.org/15846 - Remove. - [[deprecated("Use IceCandidateType version")]] Port( - webrtc::TaskQueueBase* thread, - absl::string_view type ABSL_ATTRIBUTE_LIFETIME_BOUND, - rtc::PacketSocketFactory* factory, - const rtc::Network* network, - absl::string_view username_fragment, - absl::string_view password, - const webrtc::FieldTrialsView* field_trials = nullptr) - : Port(thread, - PortTypeToIceCandidateType(type), - factory, - network, - username_fragment, - password, - field_trials) {} - public: ~Port() override; @@ -419,24 +379,6 @@ class RTC_EXPORT Port : public PortInterface, public sigslot::has_slots<> { rtc::WeakPtr NewWeakPtr() { return weak_factory_.GetWeakPtr(); } - // TODO: bugs.webrtc.org/15846 - Remove. - [[deprecated("Use IceCandidateType version")]] void AddAddress( - const rtc::SocketAddress& address, - const rtc::SocketAddress& base_address, - const rtc::SocketAddress& related_address, - absl::string_view protocol, - absl::string_view relay_protocol, - absl::string_view tcptype, - absl::string_view type, - uint32_t type_preference, - uint32_t relay_preference, - absl::string_view url, - bool is_final) { - AddAddress(address, base_address, related_address, protocol, relay_protocol, - tcptype, PortTypeToIceCandidateType(type), type_preference, - relay_preference, url, is_final); - } - void AddAddress(const rtc::SocketAddress& address, const rtc::SocketAddress& base_address, const rtc::SocketAddress& related_address,