Revert of Refactoring of RTCP options in BaseChannel.

webrtc/api/rtcstatscollector_unittest.cc

Index: webrtc/api/rtcstatscollector_unittest.cc
diff --git a/webrtc/api/rtcstatscollector_unittest.cc b/webrtc/api/rtcstatscollector_unittest.cc
index a9426622fb391cddbe54edf32b9ef4a9724a235e..4d1700326928caa86606875e6ba0741c2f96ac9d 100644
--- a/webrtc/api/rtcstatscollector_unittest.cc
+++ b/webrtc/api/rtcstatscollector_unittest.cc
@@ -101,7 +101,7 @@
 namespace {
 
 const int64_t kGetStatsReportTimeoutMs = 1000;
-const bool kDefaultRtcpMuxRequired = true;
+const bool kDefaultRtcpEnabled = false;
 const bool kDefaultSrtpRequired = true;
 
 struct CertificateInfo {
@@ -598,12 +598,12 @@
   cricket::VoiceChannel voice_channel(
       test_->worker_thread(), test_->network_thread(), nullptr,
       test_->media_engine(), voice_media_channel, "VoiceContentName",
-      kDefaultRtcpMuxRequired, kDefaultSrtpRequired);
+      kDefaultRtcpEnabled, kDefaultSrtpRequired);
 
   MockVideoMediaChannel* video_media_channel = new MockVideoMediaChannel();
   cricket::VideoChannel video_channel(
       test_->worker_thread(), test_->network_thread(), nullptr,
-      video_media_channel, "VideoContentName", kDefaultRtcpMuxRequired,
+      video_media_channel, "VideoContentName", kDefaultRtcpEnabled,
       kDefaultSrtpRequired);
 
   // Audio
@@ -1446,7 +1446,7 @@
   cricket::VoiceChannel voice_channel(
       test_->worker_thread(), test_->network_thread(), nullptr,
       test_->media_engine(), voice_media_channel, "VoiceContentName",
-      kDefaultRtcpMuxRequired, kDefaultSrtpRequired);
+      kDefaultRtcpEnabled, kDefaultSrtpRequired);
 
   cricket::VoiceMediaInfo voice_media_info;
 
@@ -1518,7 +1518,7 @@
   MockVideoMediaChannel* video_media_channel = new MockVideoMediaChannel();
   cricket::VideoChannel video_channel(
       test_->worker_thread(), test_->network_thread(), nullptr,
-      video_media_channel, "VideoContentName", kDefaultRtcpMuxRequired,
+      video_media_channel, "VideoContentName", kDefaultRtcpEnabled,
       kDefaultSrtpRequired);
 
   cricket::VideoMediaInfo video_media_info;
@@ -1598,7 +1598,7 @@
   cricket::VoiceChannel voice_channel(
       test_->worker_thread(), test_->network_thread(), nullptr,
       test_->media_engine(), voice_media_channel, "VoiceContentName",
-      kDefaultRtcpMuxRequired, kDefaultSrtpRequired);
+      kDefaultRtcpEnabled, kDefaultSrtpRequired);
 
   cricket::VoiceMediaInfo voice_media_info;
 
@@ -1665,7 +1665,7 @@
   MockVideoMediaChannel* video_media_channel = new MockVideoMediaChannel();
   cricket::VideoChannel video_channel(
       test_->worker_thread(), test_->network_thread(), nullptr,
-      video_media_channel, "VideoContentName", kDefaultRtcpMuxRequired,
+      video_media_channel, "VideoContentName", kDefaultRtcpEnabled,
       kDefaultSrtpRequired);
 
   cricket::VideoMediaInfo video_media_info;
@@ -1744,11 +1744,11 @@
   cricket::VoiceChannel voice_channel(
       test_->worker_thread(), test_->network_thread(), nullptr,
       test_->media_engine(), voice_media_channel, "VoiceContentName",
-      kDefaultRtcpMuxRequired, kDefaultSrtpRequired);
+      kDefaultRtcpEnabled, kDefaultSrtpRequired);
   MockVideoMediaChannel* video_media_channel = new MockVideoMediaChannel();
   cricket::VideoChannel video_channel(
       test_->worker_thread(), test_->network_thread(), nullptr,
-      video_media_channel, "VideoContentName", kDefaultRtcpMuxRequired,
+      video_media_channel, "VideoContentName", kDefaultRtcpEnabled,
       kDefaultSrtpRequired);
 
   cricket::VoiceMediaInfo voice_media_info;