Unify newapi::RtcpMode and RTCPMethod.

webrtc/modules/rtp_rtcp/test/testAPI/test_api.cc

 /*
  *  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 121 matching lines @@
   EXPECT_EQ(0, module_->SetTransportOverhead(false, false, 0));
   EXPECT_EQ(1234 - 20 - 8, module_->MaxPayloadLength());
 }
 
 TEST_F(RtpRtcpAPITest, SSRC) {
   module_->SetSSRC(test_ssrc_);
   EXPECT_EQ(test_ssrc_, module_->SSRC());
 }
 
 TEST_F(RtpRtcpAPITest, RTCP) {
-  EXPECT_EQ(kRtcpOff, module_->RTCP());
-  module_->SetRTCPStatus(kRtcpCompound);
-  EXPECT_EQ(kRtcpCompound, module_->RTCP());
+  EXPECT_EQ(RtcpMode::kOff, module_->RTCP());
+  module_->SetRTCPStatus(RtcpMode::kCompound);
+  EXPECT_EQ(RtcpMode::kCompound, module_->RTCP());
 
   EXPECT_EQ(0, module_->SetCNAME("john.doe@test.test"));
 
   EXPECT_FALSE(module_->TMMBR());
   module_->SetTMMBRStatus(true);
   EXPECT_TRUE(module_->TMMBR());
   module_->SetTMMBRStatus(false);
   EXPECT_FALSE(module_->TMMBR());
 
   EXPECT_EQ(kNackOff, rtp_receiver_->NACK());
@@ skipping 23 matching lines @@
   RTPHeader rtx_header;
   rtx_header.ssrc = kRtxSsrc;
   rtx_header.payloadType = kRtxPayloadType;
   EXPECT_TRUE(rtp_payload_registry_->IsRtx(rtx_header));
   rtx_header.ssrc = 0;
   EXPECT_FALSE(rtp_payload_registry_->IsRtx(rtx_header));
   rtx_header.ssrc = kRtxSsrc;
   rtx_header.payloadType = 0;
   EXPECT_TRUE(rtp_payload_registry_->IsRtx(rtx_header));
 }