From 489f648ea3f1f0a7d670578e197cc9014e1ce41c Mon Sep 17 00:00:00 2001 From: "Daniel.L (Byoungchan Lee)" Date: Wed, 20 Jul 2022 15:17:41 +0900 Subject: [PATCH] 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 Commit-Queue: Daniel.L (Byoungchan) Lee Auto-Submit: Daniel.L (Byoungchan) Lee Commit-Queue: Tomas Gunnarsson Cr-Commit-Position: refs/heads/main@{#37564} --- rtc_base/network.cc | 14 ++++---------- rtc_base/network.h | 10 ---------- 2 files changed, 4 insertions(+), 20 deletions(-) diff --git a/rtc_base/network.cc b/rtc_base/network.cc index 9b53eb36c9..b59076e2e4 100644 --- a/rtc_base/network.cc +++ b/rtc_base/network.cc @@ -520,7 +520,9 @@ BasicNetworkManager::BasicNetworkManager( 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 @@ void BasicNetworkManager::StopNetworkMonitor() { 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_factory->CreateSocket(family, SOCK_DGRAM)); + socket_factory_->CreateSocket(family, SOCK_DGRAM)); if (!socket) { RTC_LOG_ERR(LS_ERROR) << "Socket creation failed"; return IPAddress(); diff --git a/rtc_base/network.h b/rtc_base/network.h index 688cf46ba9..3730054eb3 100644 --- a/rtc_base/network.h +++ b/rtc_base/network.h @@ -262,16 +262,6 @@ class RTC_EXPORT BasicNetworkManager : public NetworkManagerBase, 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)