Unify newapi::RtcpMode and RTCPMethod.

webrtc/voice_engine/channel.cc

Index: webrtc/voice_engine/channel.cc
diff --git a/webrtc/voice_engine/channel.cc b/webrtc/voice_engine/channel.cc
index ee170587325b479a2e460327d7dfd11b597c70fa..0a522ecb6fffd08553d68fd8151cc718931ddb5a 100644
--- a/webrtc/voice_engine/channel.cc
+++ b/webrtc/voice_engine/channel.cc
@@ -2789,7 +2789,7 @@ void Channel::SetRTCPStatus(bool enable) {
 int
 Channel::GetRTCPStatus(bool& enabled)
 {
-    RTCPMethod method = _rtpRtcpModule->RTCP();
+    RtcpMode method = _rtpRtcpModule->RTCP();
     enabled = (method != kRtcpOff);
     return 0;
 }
@@ -2936,7 +2936,7 @@ Channel::SendApplicationDefinedRTCPPacket(unsigned char subType,
             "SendApplicationDefinedRTCPPacket() invalid length value");
         return -1;
     }
-    RTCPMethod status = _rtpRtcpModule->RTCP();
+    RtcpMode status = _rtpRtcpModule->RTCP();
     if (status == kRtcpOff)
     {
         _engineStatisticsPtr->SetLastError(
@@ -3911,7 +3911,7 @@ int32_t Channel::GetPlayoutFrequency() {
 }
 
 int64_t Channel::GetRTT(bool allow_associate_channel) const {
-  RTCPMethod method = _rtpRtcpModule->RTCP();
+  RtcpMode method = _rtpRtcpModule->RTCP();
   if (method == kRtcpOff) {
     return 0;
   }