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 list, + bool* changed, + NetworkManager::Stats* stats) { + std::vector> 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 list, + bool* changed) { + NetworkManager::Stats stats; + MergeNetworkList(list, changed, &stats); +} + void NetworkManagerBase::MergeNetworkList( std::vector> 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; + // 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> list, bool* changed, NetworkManager::Stats* stats); + ABSL_DEPRECATED("bugs.webrtc.org/13869") + void MergeNetworkList(std::vector list, bool* changed); + + ABSL_DEPRECATED("bugs.webrtc.org/13869") + void MergeNetworkList(std::vector list, + bool* changed, + NetworkManager::Stats* stats); void set_enumeration_permission(EnumerationPermission state) { enumeration_permission_ = state;