Revert of Refactoring of RTCP options in BaseChannel.

webrtc/api/rtpsenderreceiver_unittest.cc

Index: webrtc/api/rtpsenderreceiver_unittest.cc
diff --git a/webrtc/api/rtpsenderreceiver_unittest.cc b/webrtc/api/rtpsenderreceiver_unittest.cc
index 7f6cb3a49fdb3e2da9d0a974e3e59534dd21ee49..b6c51841bdd829c707d782e70882ea4b5fba2af3 100644
--- a/webrtc/api/rtpsenderreceiver_unittest.cc
+++ b/webrtc/api/rtpsenderreceiver_unittest.cc
@@ -62,18 +62,18 @@
         stream_(MediaStream::Create(kStreamLabel1)) {
     // Create channels to be used by the RtpSenders and RtpReceivers.
     channel_manager_.Init();
-    bool rtcp_mux_required = true;
+    bool rtcp_enabled = false;
     bool srtp_required = true;
     cricket::TransportChannel* rtp_transport =
         fake_transport_controller_.CreateTransportChannel(
             cricket::CN_AUDIO, cricket::ICE_CANDIDATE_COMPONENT_RTP);
     voice_channel_ = channel_manager_.CreateVoiceChannel(
         &fake_media_controller_, rtp_transport, nullptr, rtc::Thread::Current(),
-        cricket::CN_AUDIO, nullptr, rtcp_mux_required, srtp_required,
+        cricket::CN_AUDIO, nullptr, rtcp_enabled, srtp_required,
         cricket::AudioOptions());
     video_channel_ = channel_manager_.CreateVideoChannel(
         &fake_media_controller_, rtp_transport, nullptr, rtc::Thread::Current(),
-        cricket::CN_VIDEO, nullptr, rtcp_mux_required, srtp_required,
+        cricket::CN_VIDEO, nullptr, rtcp_enabled, srtp_required,
         cricket::VideoOptions());
     voice_media_channel_ = media_engine_->GetVoiceChannel(0);
     video_media_channel_ = media_engine_->GetVideoChannel(0);