Unify newapi::RtcpMode and RTCPMethod.

webrtc/modules/rtp_rtcp/source/rtcp_sender.cc

Index: webrtc/modules/rtp_rtcp/source/rtcp_sender.cc
diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_sender.cc b/webrtc/modules/rtp_rtcp/source/rtcp_sender.cc
index f250e29af7dec7ff29f6d8f1cf5b404cd1f1a2d6..e437a15a460abec6e42920ed7e47eee603c3f5c4 100644
--- a/webrtc/modules/rtp_rtcp/source/rtcp_sender.cc
+++ b/webrtc/modules/rtp_rtcp/source/rtcp_sender.cc
@@ -139,7 +139,7 @@ RTCPSender::RTCPSender(
     Transport* outgoing_transport)
     : audio_(audio),
       clock_(clock),
-      method_(kRtcpOff),
+      method_(RtcpMode::kOff),
       transport_(outgoing_transport),
 
       critical_section_rtcp_sender_(
@@ -196,16 +196,16 @@ RTCPSender::RTCPSender(
 RTCPSender::~RTCPSender() {
 }
 
-RTCPMethod RTCPSender::Status() const {
+RtcpMode RTCPSender::Status() const {
   CriticalSectionScoped lock(critical_section_rtcp_sender_.get());
   return method_;
 }
 
-void RTCPSender::SetRTCPStatus(RTCPMethod method) {
+void RTCPSender::SetRTCPStatus(RtcpMode method) {
   CriticalSectionScoped lock(critical_section_rtcp_sender_.get());
   method_ = method;
 
-  if (method == kRtcpOff)
+  if (method == RtcpMode::kOff)
     return;
   next_time_to_send_rtcp_ =
       clock_->TimeInMilliseconds() +
@@ -223,7 +223,7 @@ int32_t RTCPSender::SetSendingStatus(const FeedbackState& feedback_state,
   {
     CriticalSectionScoped lock(critical_section_rtcp_sender_.get());
 
-    if (method_ != kRtcpOff) {
+    if (method_ != RtcpMode::kOff) {
       if (sending == false && sending_ == true) {
         // Trigger RTCP bye
         sendRTCPBye = true;
@@ -402,7 +402,7 @@ From RFC 3550
 
   CriticalSectionScoped lock(critical_section_rtcp_sender_.get());
 
-  if (method_ == kRtcpOff)
+  if (method_ == RtcpMode::kOff)
     return false;
 
   if (!audio_ && sendKeyframeBeforeRTP) {
@@ -933,7 +933,7 @@ int32_t RTCPSender::SendCompoundRTCP(
     uint64_t pictureID) {
   {
     CriticalSectionScoped lock(critical_section_rtcp_sender_.get());
-    if (method_ == kRtcpOff) {
+    if (method_ == RtcpMode::kOff) {
       LOG(LS_WARNING) << "Can't send rtcp if it is disabled.";
       return -1;
     }
@@ -977,8 +977,8 @@ int RTCPSender::PrepareRTCP(const FeedbackState& feedback_state,
     RTC_DCHECK(ConsumeFlag(kRtcpReport) == false);
   } else {
     generate_report =
-        (ConsumeFlag(kRtcpReport) && method_ == kRtcpNonCompound) ||
-        method_ == kRtcpCompound;
+        (ConsumeFlag(kRtcpReport) && method_ == RtcpMode::kReducedSize) ||
+        method_ == RtcpMode::kCompound;
     if (generate_report)
       SetFlag(sending_ ? kRtcpSr : kRtcpRr, true);
   }