Unify newapi::RtcpMode and RTCPMethod.

webrtc/video/video_send_stream_tests.cc

Index: webrtc/video/video_send_stream_tests.cc
diff --git a/webrtc/video/video_send_stream_tests.cc b/webrtc/video/video_send_stream_tests.cc
index 688278eadca40159af3b52d9d160c40375322e56..b0323c424df900437ab0112f298a3965885c03ca 100644
--- a/webrtc/video/video_send_stream_tests.cc
+++ b/webrtc/video/video_send_stream_tests.cc
@@ -332,7 +332,7 @@ TEST_F(VideoSendStreamTest, SupportsFec) {
                                &lossy_receive_stats, nullptr);
         EXPECT_EQ(0, rtcp_sender.RegisterSendTransport(&transport_adapter_));
 
-        rtcp_sender.SetRTCPStatus(kRtcpNonCompound);
+        rtcp_sender.SetRTCPStatus(kRtcpReducedSize);
         rtcp_sender.SetRemoteSSRC(kSendSsrcs[0]);
 
         RTCPSender::FeedbackState feedback_state;
@@ -414,7 +414,7 @@ void VideoSendStreamTest::TestNackRetransmission(
                                nullptr);
         EXPECT_EQ(0, rtcp_sender.RegisterSendTransport(&transport_adapter_));
 
-        rtcp_sender.SetRTCPStatus(kRtcpNonCompound);
+        rtcp_sender.SetRTCPStatus(kRtcpReducedSize);
         rtcp_sender.SetRemoteSSRC(kSendSsrcs[0]);
 
         RTCPSender::FeedbackState feedback_state;
@@ -601,7 +601,7 @@ void VideoSendStreamTest::TestPacketFragmentationSize(VideoFormat format,
                                &lossy_receive_stats, nullptr);
         EXPECT_EQ(0, rtcp_sender.RegisterSendTransport(&transport_adapter_));
 
-        rtcp_sender.SetRTCPStatus(kRtcpNonCompound);
+        rtcp_sender.SetRTCPStatus(kRtcpReducedSize);
         rtcp_sender.SetRemoteSSRC(kSendSsrcs[0]);
 
         RTCPSender::FeedbackState feedback_state;
@@ -831,7 +831,7 @@ TEST_F(VideoSendStreamTest, SuspendBelowMinBitrate) {
       RTCPSender rtcp_sender(false, clock_, &receive_stats, nullptr);
       EXPECT_EQ(0, rtcp_sender.RegisterSendTransport(&transport_adapter_));
 
-      rtcp_sender.SetRTCPStatus(kRtcpNonCompound);
+      rtcp_sender.SetRTCPStatus(kRtcpReducedSize);
       rtcp_sender.SetRemoteSSRC(kSendSsrcs[0]);
       if (remb_value > 0) {
         rtcp_sender.SetREMBStatus(true);
@@ -891,7 +891,7 @@ TEST_F(VideoSendStreamTest, NoPaddingWhenVideoIsMuted) {
                              nullptr);
       EXPECT_EQ(0, rtcp_sender.RegisterSendTransport(&transport_adapter_));
 
-      rtcp_sender.SetRTCPStatus(kRtcpNonCompound);
+      rtcp_sender.SetRTCPStatus(kRtcpReducedSize);
       rtcp_sender.SetRemoteSSRC(kSendSsrcs[0]);
 
       RTCPSender::FeedbackState feedback_state;
@@ -952,7 +952,7 @@ TEST_F(VideoSendStreamTest, MinTransmitBitrateRespectsRemb) {
       config.outgoing_transport = &feedback_transport_;
       rtp_rtcp_.reset(RtpRtcp::CreateRtpRtcp(config));
       rtp_rtcp_->SetREMBStatus(true);
-      rtp_rtcp_->SetRTCPStatus(kRtcpNonCompound);
+      rtp_rtcp_->SetRTCPStatus(kRtcpReducedSize);
     }
 
     void OnStreamsCreated(