From 067818fe85adfce420c33fd3adc40e1d109f3a20 Mon Sep 17 00:00:00 2001
From: Danil Chapovalov <danilchap@webrtc.org>
Date: Mon, 10 Sep 2018 09:59:51 +0200
Subject: [PATCH] Move RtcpTransceiver deletion of copy and assign methods to
 public section

Bug: chromium:881453
Change-Id: Iff5c522b983af018c1308649887a1121519c73ea
Reviewed-on: https://webrtc-review.googlesource.com/98981
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Commit-Queue: Danil Chapovalov <danilchap@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#24652}
---
 modules/rtp_rtcp/source/rtcp_transceiver.h      | 5 ++---
 modules/rtp_rtcp/source/rtcp_transceiver_impl.h | 5 ++---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/modules/rtp_rtcp/source/rtcp_transceiver.h b/modules/rtp_rtcp/source/rtcp_transceiver.h
index 9f823cccf3..fc9488c4ab 100644
--- a/modules/rtp_rtcp/source/rtcp_transceiver.h
+++ b/modules/rtp_rtcp/source/rtcp_transceiver.h
@@ -17,7 +17,6 @@
 
 #include "modules/rtp_rtcp/source/rtcp_transceiver_config.h"
 #include "modules/rtp_rtcp/source/rtcp_transceiver_impl.h"
-#include "rtc_base/constructormagic.h"
 #include "rtc_base/copyonwritebuffer.h"
 #include "rtc_base/task_queue.h"
 
@@ -29,6 +28,8 @@ namespace webrtc {
 class RtcpTransceiver : public RtcpFeedbackSenderInterface {
  public:
   explicit RtcpTransceiver(const RtcpTransceiverConfig& config);
+  RtcpTransceiver(const RtcpTransceiver&) = delete;
+  RtcpTransceiver& operator=(const RtcpTransceiver&) = delete;
   // Note that interfaces provided in constructor still might be used after the
   // destructor. However they can only be used on the confic.task_queue.
   // Use Stop function to get notified when they are no longer used or
@@ -91,8 +92,6 @@ class RtcpTransceiver : public RtcpFeedbackSenderInterface {
  private:
   rtc::TaskQueue* const task_queue_;
   std::unique_ptr<RtcpTransceiverImpl> rtcp_transceiver_;
-
-  RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(RtcpTransceiver);
 };
 
 }  // namespace webrtc
diff --git a/modules/rtp_rtcp/source/rtcp_transceiver_impl.h b/modules/rtp_rtcp/source/rtcp_transceiver_impl.h
index c97b2c5c11..eb9086f53e 100644
--- a/modules/rtp_rtcp/source/rtcp_transceiver_impl.h
+++ b/modules/rtp_rtcp/source/rtcp_transceiver_impl.h
@@ -25,7 +25,6 @@
 #include "modules/rtp_rtcp/source/rtcp_packet/target_bitrate.h"
 #include "modules/rtp_rtcp/source/rtcp_transceiver_config.h"
 #include "rtc_base/cancelable_task_handle.h"
-#include "rtc_base/constructormagic.h"
 #include "system_wrappers/include/ntp_time.h"
 
 namespace webrtc {
@@ -36,6 +35,8 @@ namespace webrtc {
 class RtcpTransceiverImpl {
  public:
   explicit RtcpTransceiverImpl(const RtcpTransceiverConfig& config);
+  RtcpTransceiverImpl(const RtcpTransceiverImpl&) = delete;
+  RtcpTransceiverImpl& operator=(const RtcpTransceiverImpl&) = delete;
   ~RtcpTransceiverImpl();
 
   void AddMediaReceiverRtcpObserver(uint32_t remote_ssrc,
@@ -96,8 +97,6 @@ class RtcpTransceiverImpl {
   // needed.
   std::map<uint32_t, RemoteSenderState> remote_senders_;
   rtc::CancelableTaskHandle periodic_task_handle_;
-
-  RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(RtcpTransceiverImpl);
 };
 
 }  // namespace webrtc