commit fe6e50f0af98f54afe9a1865324b645745240c84
author Niels Möller <nisse@webrtc.org> Tue Feb 05 16:32:57 2019
committer Commit Bot <commit-bot@chromium.org> Wed Feb 06 16:14:45 2019
tree 11e727ad0040aede65f82d5f49d4094a64b37b63
parent 3e6188868bf37c4fbb85489ed34ce6745bb47ddd

Allow more than one registered network change callback in MediaTransport

Adds methods AddNetworkChangeCallback and RemoveNetworkChangeCallback,
to replace SetNetworkChangeCallback. Needed because both VideoChannel and
VoiceChannel register such a callback.

Bug: webrtc:9719
Change-Id: Ic592b2d775d721a0f44ba0af88ed963bf02d73a3
Reviewed-on: https://webrtc-review.googlesource.com/c/121460
Reviewed-by: Steve Anton <steveanton@webrtc.org>
Reviewed-by: Peter Slatala <psla@webrtc.org>
Commit-Queue: Niels Moller <nisse@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#26575}

api/DEPS

diff --git a/api/DEPS b/api/DEPS
index 96fd36b..9bb179a 100644
--- a/api/DEPS
+++ b/api/DEPS
@@ -111,6 +111,7 @@
   "media_transport_interface\.h": [
     "+rtc_base/copy_on_write_buffer.h",  # As used by datachannelinterface.h
     "+rtc_base/network_route.h",
+    "+rtc_base/deprecation.h",
   ],
 
   "peer_connection_factory_proxy\.h": [

api/media_transport_interface.h

diff --git a/api/media_transport_interface.h b/api/media_transport_interface.h
index ad1f7c6..cc97b35 100644
--- a/api/media_transport_interface.h
+++ b/api/media_transport_interface.h
@@ -29,6 +29,7 @@
 #include "api/units/data_rate.h"
 #include "api/video/encoded_image.h"
 #include "rtc_base/copy_on_write_buffer.h"
+#include "rtc_base/deprecation.h"
 #include "rtc_base/network_route.h"
 
 namespace rtc {
@@ -435,6 +436,7 @@
   // setting it to nullptr.
   // TODO(nisse): The SetNetworkChangeCallback is being replaced with Add/Remove
   // methods, because both video channel and voice channel need to register.
+  RTC_DEPRECATED
   virtual void SetNetworkChangeCallback(
       MediaTransportNetworkChangeCallback* callback);
   virtual void AddNetworkChangeCallback(

pc/channel.cc

diff --git a/pc/channel.cc b/pc/channel.cc
index 0e91395..a408a85 100644
--- a/pc/channel.cc
+++ b/pc/channel.cc
@@ -154,7 +154,7 @@
   RTC_DCHECK_RUN_ON(worker_thread_);
 
   if (media_transport_) {
-    media_transport_->SetNetworkChangeCallback(nullptr);
+    media_transport_->RemoveNetworkChangeCallback(this);
   }
 
   // Eats any outstanding messages or packets.
@@ -217,7 +217,7 @@
   RTC_LOG(LS_INFO) << "BaseChannel::Init_w, media_transport="
                    << (media_transport_ != nullptr);
   if (media_transport_) {
-    media_transport_->SetNetworkChangeCallback(this);
+    media_transport_->AddNetworkChangeCallback(this);
   }
 }