commit 489f648ea3f1f0a7d670578e197cc9014e1ce41c
author Daniel.L (Byoungchan Lee) <daniel.l@hpcnt.com> Wed Jul 20 06:17:41 2022
committer WebRTC LUCI CQ <webrtc-scoped@luci-project-accounts.iam.gserviceaccount.com> Wed Jul 20 08:14:04 2022
tree c4876a37a13e82d96c2d06abc957b4d711476a72
parent 30c2a31309afc6b1d523e8a68ea6aa29f8661970

Remove the deprecated BasicNetworkManager constructor

Bug: webrtc:13145
Change-Id: I43696aea7256d3fe94a11514ea6d81e3c3ac5f57
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/268780
Reviewed-by: Tomas Gunnarsson <tommi@webrtc.org>
Commit-Queue: Daniel.L (Byoungchan) Lee <daniel.l@hpcnt.com>
Auto-Submit: Daniel.L (Byoungchan) Lee <daniel.l@hpcnt.com>
Commit-Queue: Tomas Gunnarsson <tommi@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#37564}

rtc_base/network.cc

diff --git a/rtc_base/network.cc b/rtc_base/network.cc
index 9b53eb3..b59076e 100644
--- a/rtc_base/network.cc
+++ b/rtc_base/network.cc
@@ -520,7 +520,9 @@
       allow_mac_based_ipv6_(
           field_trials_->IsEnabled("WebRTC-AllowMACBasedIPv6")),
       bind_using_ifname_(
-          !field_trials_->IsDisabled("WebRTC-BindUsingInterfaceName")) {}
+          !field_trials_->IsDisabled("WebRTC-BindUsingInterfaceName")) {
+  RTC_DCHECK(socket_factory_);
+}
 
 BasicNetworkManager::~BasicNetworkManager() {
   if (task_safety_flag_) {
@@ -981,16 +983,8 @@
 IPAddress BasicNetworkManager::QueryDefaultLocalAddress(int family) const {
   RTC_DCHECK(family == AF_INET || family == AF_INET6);
 
-  // TODO(bugs.webrtc.org/13145): Delete support for null `socket_factory_`,
-  // require socket factory to be provided to constructor.
-  SocketFactory* socket_factory = socket_factory_;
-  if (!socket_factory) {
-    socket_factory = thread_->socketserver();
-  }
-  RTC_DCHECK(socket_factory);
-
   std::unique_ptr<Socket> socket(
-      socket_factory->CreateSocket(family, SOCK_DGRAM));
+      socket_factory_->CreateSocket(family, SOCK_DGRAM));
   if (!socket) {
     RTC_LOG_ERR(LS_ERROR) << "Socket creation failed";
     return IPAddress();

rtc_base/network.h

diff --git a/rtc_base/network.h b/rtc_base/network.h
index 688cf46..3730054 100644
--- a/rtc_base/network.h
+++ b/rtc_base/network.h
@@ -262,16 +262,6 @@
                                        public NetworkBinderInterface,
                                        public sigslot::has_slots<> {
  public:
-  // This version is used by chromium.
-  ABSL_DEPRECATED(
-      "Use the version with socket_factory, see bugs.webrtc.org/13145")
-  explicit BasicNetworkManager(
-      const webrtc::FieldTrialsView* field_trials = nullptr)
-      : BasicNetworkManager(
-            /* network_monitor_factory= */ nullptr,
-            /* socket_factory= */ nullptr,
-            field_trials) {}
-
   // This is used by lots of downstream code.
   BasicNetworkManager(SocketFactory* socket_factory,
                       const webrtc::FieldTrialsView* field_trials = nullptr)