Unify newapi::RtcpMode and RTCPMethod.

webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl.h

 /*
  *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 108 matching lines @@
                         int64_t capture_time_ms,
                         bool retransmission) override;
 
   // Returns the number of padding bytes actually sent, which can be more or
   // less than |bytes|.
   size_t TimeToSendPadding(size_t bytes) override;
 
   // RTCP part.
 
   // Get RTCP status.
-  RTCPMethod RTCP() const override;
+  RtcpMode RTCP() const override;
 
   // Configure RTCP status i.e on/off.
-  void SetRTCPStatus(RTCPMethod method) override;
+  void SetRTCPStatus(RtcpMode method) override;
 
   // Set RTCP CName.
   int32_t SetCNAME(const char* c_name) override;
 
   // Get remote CName.
   int32_t RemoteCNAME(uint32_t remote_ssrc,
                       char c_name[RTCP_CNAME_SIZE]) const override;
 
   // Get remote NTP.
   int32_t RemoteNTP(uint32_t* received_ntp_secs,
@@ skipping 236 matching lines @@
   PacketLossStats receive_loss_stats_;
 
   // The processed RTT from RtcpRttStats.
   rtc::scoped_ptr<CriticalSectionWrapper> critical_section_rtt_;
   int64_t rtt_ms_;
 };
 
 }  // namespace webrtc
 
 #endif  // WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_RTCP_IMPL_H_