From 2f9291c7fb09fa7c3435a964cd0d67bfd884fe91 Mon Sep 17 00:00:00 2001
From: Ilya Nikolaevskiy <ilnik@webrtc.org>
Date: Fri, 22 Apr 2022 11:36:28 +0000
Subject: [PATCH] Revert "Delete deprecated versions of MergeNetworkList"

This reverts commit 7679e9bf071250e8e98ef6ef58962ddcc73cd498.

Reason for revert: Breaks chromium roll (see https://ci.chromium.org/ui/p/chromium/builders/try/linux-chromeos-compile-dbg/998457/overview)

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: I781ac1980687367ee17d033f6613c2e487b7966f
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/259775
Auto-Submit: Ilya Nikolaevskiy <ilnik@webrtc.org>
Bot-Commit: rubber-stamper@appspot.gserviceaccount.com <rubber-stamper@appspot.gserviceaccount.com>
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#36621}
---
 rtc_base/network.cc | 21 +++++++++++++++++++++
 rtc_base/network.h  | 10 ++++++++++
 2 files changed, 31 insertions(+)

diff --git a/rtc_base/network.cc b/rtc_base/network.cc
index 7a1266c8c0..782fa5cf89 100644
--- a/rtc_base/network.cc
+++ b/rtc_base/network.cc
@@ -329,6 +329,27 @@ void NetworkManagerBase::MergeNetworkList(
   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,
diff --git a/rtc_base/network.h b/rtc_base/network.h
index e801022d7c..4c8aba96e7 100644
--- a/rtc_base/network.h
+++ b/rtc_base/network.h
@@ -117,6 +117,9 @@ class NetworkMask {
 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
@@ -212,6 +215,13 @@ class RTC_EXPORT NetworkManagerBase : public NetworkManager {
   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;