commit 58a9f6d4904faf5988fe71778e13b73fa7974caa
author Danil Chapovalov <danilchap@webrtc.org> Fri May 10 09:03:29 2024
committer WebRTC LUCI CQ <webrtc-scoped@luci-project-accounts.iam.gserviceaccount.com> Fri May 10 11:25:19 2024
tree 3e143e366f409211fd19482a2c732c595aa8d6f4
parent 2cdf840b5392de9a46582b3de334f5644011b693

Delete depercated variant of the Network::GetCost function

Bug: webrtc:42220378
Change-Id: Iebfc924ab55896981cbf83407a9b049e4d0dde8f
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/350303
Auto-Submit: Danil Chapovalov <danilchap@webrtc.org>
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#42269}

rtc_base/network.cc

diff --git a/rtc_base/network.cc b/rtc_base/network.cc
index 4be6eed..b5530ab 100644
--- a/rtc_base/network.cc
+++ b/rtc_base/network.cc
@@ -32,11 +32,9 @@
 #include "absl/strings/match.h"
 #include "absl/strings/string_view.h"
 #include "api/task_queue/pending_task_safety_flag.h"
-#include "api/transport/field_trial_based_config.h"
 #include "api/units/time_delta.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/logging.h"
-#include "rtc_base/memory/always_valid_pointer.h"
 #include "rtc_base/network_monitor.h"
 #include "rtc_base/socket.h"  // includes something that makes windows happy
 #include "rtc_base/string_encode.h"
@@ -1205,12 +1203,6 @@
   return mdns_responder_provider_->GetMdnsResponder();
 }
 
-uint16_t Network::GetCost(const webrtc::FieldTrialsView* field_trials) const {
-  return GetCost(
-      *webrtc::AlwaysValidPointer<const webrtc::FieldTrialsView,
-                                  webrtc::FieldTrialBasedConfig>(field_trials));
-}
-
 uint16_t Network::GetCost(const webrtc::FieldTrialsView& field_trials) const {
   AdapterType type = IsVpn() ? underlying_type_for_vpn_ : type_;
   const bool use_differentiated_cellular_costs =

rtc_base/network.h

diff --git a/rtc_base/network.h b/rtc_base/network.h
index 4a97a45..f75cf0d 100644
--- a/rtc_base/network.h
+++ b/rtc_base/network.h
@@ -535,9 +535,6 @@
   // Twice per Network in BasicPortAllocator if
   // PORTALLOCATOR_DISABLE_COSTLY_NETWORKS. Once in Port::Construct() (and when
   // Port::OnNetworkTypeChanged is called).
-  ABSL_DEPRECATED(
-      "Use the version with field trials, see bugs.webrtc.org/webrtc:10335")
-  uint16_t GetCost(const webrtc::FieldTrialsView* field_trials = nullptr) const;
   uint16_t GetCost(const webrtc::FieldTrialsView& field_trials) const;
 
   // A unique id assigned by the network manager, which may be signaled