commit 6228d870dcdf2349048e94ce340f067c52a69f98
author Niels Möller <nisse@webrtc.org> Tue Apr 19 12:50:21 2022 +0200
committer WebRTC LUCI CQ <webrtc-scoped@luci-project-accounts.iam.gserviceaccount.com> Fri Apr 29 11:19:02 2022 +0000
tree d1b17f2cd54841a9a70ce8e6bab7d5260bca463a
parent 166650ada7ce6aa503bfab77dcbd7f0835b238b2

Reland "Delete deprecated versions of MergeNetworkList"

This is a reland of commit 7679e9bf071250e8e98ef6ef58962ddcc73cd498

Breakage in chrome/services/sharing/ (not built as part of webrtc
presubmit) should be fixed with
https://chromium-review.googlesource.com/c/chromium/src/+/3604642

Original change's description:
> Delete deprecated versions of MergeNetworkList
>
> Bug: webrtc:13869
> Change-Id: I6b888ba14ca664a1f28de2fb59b7d1343cb18bd8
> Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/259300
> Reviewed-by: Harald Alvestrand <hta@webrtc.org>
> Commit-Queue: Niels Moller <nisse@webrtc.org>
> Cr-Commit-Position: refs/heads/main@{#36611}

Bug: webrtc:13869
Change-Id: I4cf0fe0f2310eabb2d0b32c6dec5f8aef64c7712
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/259869
Reviewed-by: Harald Alvestrand <hta@webrtc.org>
Reviewed-by: Ilya Nikolaevskiy <ilnik@webrtc.org>
Commit-Queue: Niels Moller <nisse@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#36704}

rtc_base/network.cc

diff --git a/rtc_base/network.cc b/rtc_base/network.cc
index 782fa5c..7a1266c 100644
--- a/rtc_base/network.cc
+++ b/rtc_base/network.cc
@@ -329,27 +329,6 @@
   MergeNetworkList(std::move(new_networks), changed, &stats);
 }
 
-// TODO(bugs.webrtc.org/13869): Legacy method, taking ownership of raw pointers.
-// Delete, as soon as downstream users are updated.
-void NetworkManagerBase::MergeNetworkList(std::vector<Network*> list,
-                                          bool* changed,
-                                          NetworkManager::Stats* stats) {
-  std::vector<std::unique_ptr<Network>> list_owned;
-  list_owned.reserve(list.size());
-  for (Network* network : list) {
-    list_owned.push_back(absl::WrapUnique(network));
-  }
-  MergeNetworkList(std::move(list_owned), changed, stats);
-}
-
-// TODO(bugs.webrtc.org/13869): Legacy method, taking ownership of raw pointers.
-// Delete, as soon as downstream users are updated.
-void NetworkManagerBase::MergeNetworkList(std::vector<Network*> list,
-                                          bool* changed) {
-  NetworkManager::Stats stats;
-  MergeNetworkList(list, changed, &stats);
-}
-
 void NetworkManagerBase::MergeNetworkList(
     std::vector<std::unique_ptr<Network>> new_networks,
     bool* changed,

rtc_base/network.h

diff --git a/rtc_base/network.h b/rtc_base/network.h
index 4c8aba9..e801022 100644
--- a/rtc_base/network.h
+++ b/rtc_base/network.h
@@ -117,9 +117,6 @@
 class RTC_EXPORT NetworkManager : public DefaultLocalAddressProvider,
                                   public MdnsResponderProvider {
  public:
-  using NetworkList ABSL_DEPRECATED("bugs.webrtc.org/13869") =
-      std::vector<Network*>;
-
   // This enum indicates whether adapter enumeration is allowed.
   enum EnumerationPermission {
     ENUMERATION_ALLOWED,  // Adapter enumeration is allowed. Getting 0 network
@@ -215,13 +212,6 @@
   void MergeNetworkList(std::vector<std::unique_ptr<Network>> list,
                         bool* changed,
                         NetworkManager::Stats* stats);
-  ABSL_DEPRECATED("bugs.webrtc.org/13869")
-  void MergeNetworkList(std::vector<Network*> list, bool* changed);
-
-  ABSL_DEPRECATED("bugs.webrtc.org/13869")
-  void MergeNetworkList(std::vector<Network*> list,
-                        bool* changed,
-                        NetworkManager::Stats* stats);
 
   void set_enumeration_permission(EnumerationPermission state) {
     enumeration_permission_ = state;