From ab9395924c18aed2c5cfc114c06d153a1c2c68ae Mon Sep 17 00:00:00 2001
From: Tommi <tommi@webrtc.org>
Date: Fri, 15 Mar 2024 14:03:27 +0100
Subject: [PATCH] Remove deprecated Port ctors and AddAddress

Bug: webrtc:15846
Change-Id: I7fafdefc0108c45d2865584aa01f44caa95ec36f
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/342521
Commit-Queue: Tomas Gunnarsson <tommi@webrtc.org>
Reviewed-by: Harald Alvestrand <hta@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#41915}
---
 p2p/base/port.h | 58 -------------------------------------------------
 1 file changed, 58 deletions(-)

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<Port> 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,