From 6dd7f9120e1c1f4e77d1bb68c895b925b53258f2 Mon Sep 17 00:00:00 2001
From: Danil Chapovalov <danilchap@webrtc.org>
Date: Wed, 24 Oct 2018 18:55:01 +0200
Subject: [PATCH] Remove deprecated deregistration functions in RtcpTransceiver

These functions were deprecated in
https://webrtc-review.googlesource.com/c/src/+/107305

Bug: None
Change-Id: I3246f1e2f16be7591daec520e90c6b75071eb92d
Reviewed-on: https://webrtc-review.googlesource.com/c/107730
Commit-Queue: Danil Chapovalov <danilchap@webrtc.org>
Reviewed-by: Niels Moller <nisse@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#25388}
---
 modules/rtp_rtcp/BUILD.gn                   |  1 -
 modules/rtp_rtcp/source/rtcp_transceiver.cc | 19 -------------------
 modules/rtp_rtcp/source/rtcp_transceiver.h  |  8 --------
 3 files changed, 28 deletions(-)

diff --git a/modules/rtp_rtcp/BUILD.gn b/modules/rtp_rtcp/BUILD.gn
index 5b9fa9cd65..393fb3f63f 100644
--- a/modules/rtp_rtcp/BUILD.gn
+++ b/modules/rtp_rtcp/BUILD.gn
@@ -251,7 +251,6 @@ rtc_source_set("rtcp_transceiver") {
     "../../api:transport_api",
     "../../api/video:video_bitrate_allocation",
     "../../rtc_base:checks",
-    "../../rtc_base:deprecation",
     "../../rtc_base:rtc_base_approved",
     "../../rtc_base:rtc_cancelable_task",
     "../../rtc_base:rtc_task_queue",
diff --git a/modules/rtp_rtcp/source/rtcp_transceiver.cc b/modules/rtp_rtcp/source/rtcp_transceiver.cc
index 9c48b993ac..57d2142ffa 100644
--- a/modules/rtp_rtcp/source/rtcp_transceiver.cc
+++ b/modules/rtp_rtcp/source/rtcp_transceiver.cc
@@ -39,13 +39,6 @@ RtcpTransceiver::~RtcpTransceiver() {
   RTC_DCHECK(!rtcp_transceiver_);
 }
 
-void RtcpTransceiver::Stop(std::unique_ptr<rtc::QueuedTask> on_destroyed) {
-  RTC_DCHECK(rtcp_transceiver_);
-  task_queue_->PostTaskAndReply(Destructor{std::move(rtcp_transceiver_)},
-                                std::move(on_destroyed));
-  RTC_DCHECK(!rtcp_transceiver_);
-}
-
 void RtcpTransceiver::Stop(std::function<void()> on_destroyed) {
   RTC_DCHECK(rtcp_transceiver_);
   task_queue_->PostTask(rtc::NewClosure(
@@ -63,18 +56,6 @@ void RtcpTransceiver::AddMediaReceiverRtcpObserver(
   });
 }
 
-void RtcpTransceiver::RemoveMediaReceiverRtcpObserver(
-    uint32_t remote_ssrc,
-    MediaReceiverRtcpObserver* observer,
-    std::unique_ptr<rtc::QueuedTask> on_removed) {
-  RTC_CHECK(rtcp_transceiver_);
-  RtcpTransceiverImpl* ptr = rtcp_transceiver_.get();
-  auto remove = [ptr, remote_ssrc, observer] {
-    ptr->RemoveMediaReceiverRtcpObserver(remote_ssrc, observer);
-  };
-  task_queue_->PostTaskAndReply(std::move(remove), std::move(on_removed));
-}
-
 void RtcpTransceiver::RemoveMediaReceiverRtcpObserver(
     uint32_t remote_ssrc,
     MediaReceiverRtcpObserver* observer,
diff --git a/modules/rtp_rtcp/source/rtcp_transceiver.h b/modules/rtp_rtcp/source/rtcp_transceiver.h
index e18496fbff..9c9675110f 100644
--- a/modules/rtp_rtcp/source/rtcp_transceiver.h
+++ b/modules/rtp_rtcp/source/rtcp_transceiver.h
@@ -19,7 +19,6 @@
 #include "modules/rtp_rtcp/source/rtcp_transceiver_config.h"
 #include "modules/rtp_rtcp/source/rtcp_transceiver_impl.h"
 #include "rtc_base/copyonwritebuffer.h"
-#include "rtc_base/deprecation.h"
 #include "rtc_base/task_queue.h"
 
 namespace webrtc {
@@ -44,8 +43,6 @@ class RtcpTransceiver : public RtcpFeedbackSenderInterface {
   // Note that interfaces provided in constructor or registered with AddObserver
   // still might be used by the transceiver on the task queue
   // until |on_destroyed| runs.
-  RTC_DEPRECATED
-  void Stop(std::unique_ptr<rtc::QueuedTask> on_destroyed);
   void Stop(std::function<void()> on_destroyed);
 
   // Registers observer to be notified about incoming rtcp packets.
@@ -54,11 +51,6 @@ class RtcpTransceiver : public RtcpFeedbackSenderInterface {
                                     MediaReceiverRtcpObserver* observer);
   // Deregisters the observer. Might return before observer is deregistered.
   // Runs |on_removed| when observer is deregistered.
-  RTC_DEPRECATED
-  void RemoveMediaReceiverRtcpObserver(
-      uint32_t remote_ssrc,
-      MediaReceiverRtcpObserver* observer,
-      std::unique_ptr<rtc::QueuedTask> on_removed);
   void RemoveMediaReceiverRtcpObserver(uint32_t remote_ssrc,
                                        MediaReceiverRtcpObserver* observer,
                                        std::function<void()> on_removed);