From d70a1148aecf1ed6d09571ffe65302025e10f022 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20M=C3=B6ller?= Date: Wed, 6 Feb 2019 17:36:29 +0100 Subject: [PATCH] Delete MediaTransport method SetNetworkChangeCallback Followup to https://webrtc-review.googlesource.com/c/src/+/121460. Bug: webrtc:9719 Change-Id: I6261c450379de22d916f4048fec89e5e67e300f8 Reviewed-on: https://webrtc-review.googlesource.com/c/121651 Reviewed-by: Steve Anton Reviewed-by: Peter Slatala Commit-Queue: Peter Slatala Cr-Commit-Position: refs/heads/master@{#26576} --- api/DEPS | 1 - api/media_transport_interface.cc | 3 --- api/media_transport_interface.h | 15 ++++----------- 3 files changed, 4 insertions(+), 15 deletions(-) diff --git a/api/DEPS b/api/DEPS index 9bb179a065..96fd36b9ba 100644 --- a/api/DEPS +++ b/api/DEPS @@ -111,7 +111,6 @@ specific_include_rules = { "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": [ diff --git a/api/media_transport_interface.cc b/api/media_transport_interface.cc index a02356e077..571e82b720 100644 --- a/api/media_transport_interface.cc +++ b/api/media_transport_interface.cc @@ -154,9 +154,6 @@ MediaTransportInterface::GetLatestTargetTransferRate() { return absl::nullopt; } -void MediaTransportInterface::SetNetworkChangeCallback( - MediaTransportNetworkChangeCallback* callback) {} - void MediaTransportInterface::AddNetworkChangeCallback( MediaTransportNetworkChangeCallback* callback) {} diff --git a/api/media_transport_interface.h b/api/media_transport_interface.h index cc97b353e8..126600062b 100644 --- a/api/media_transport_interface.h +++ b/api/media_transport_interface.h @@ -29,7 +29,6 @@ #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 { @@ -429,16 +428,10 @@ class MediaTransportInterface { // might not be a very accurate number. virtual size_t GetAudioPacketOverhead() const; - // Sets an observer for network change events. If the network route is already - // established when the callback is set, |callback| will be called immediately - // with the current network route. - // Before media transport is destroyed, the callback must be unregistered by - // 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); + // Registers an observer for network change events. If the network route is + // already established when the callback is added, |callback| will be called + // immediately with the current network route. Before media transport is + // destroyed, the callback must be removed. virtual void AddNetworkChangeCallback( MediaTransportNetworkChangeCallback* callback); virtual void RemoveNetworkChangeCallback(