commit 1638114289eca6e17cc412205c2970b2f6c98280
author deadbeef <deadbeef@webrtc.org> Fri Jan 13 05:59:29 2017
committer Commit bot <commit-bot@chromium.org> Fri Jan 13 05:59:29 2017
tree af0982733e7f0ba265c5dc2b82f13db2c3d5904e
parent 5ccf9fc780603df8cc9fe9ebeb1190dde22aaae1

Refactoring of RTCP options in BaseChannel.

Previously, BaseChannel supported a "no RTCP" mode, which wasn't
being used any more and is being deleted.

Also, "RTCP mux required" previously worked by calling "ActivateRtcpMux"
after construction. Now it works by explicitly passing a
"require_rtcp_mux" parameter into the constructor.

BUG=None

Review-Url: https://codereview.webrtc.org/2622613004
Cr-Original-Commit-Position: refs/heads/master@{#16045}
Cr-Mirrored-From: https://chromium.googlesource.com/external/webrtc
Cr-Mirrored-Commit: ac22f70906175831270b399e20d0519198ac6922

api/rtcstatscollector_unittest.cc

diff --git a/api/rtcstatscollector_unittest.cc b/api/rtcstatscollector_unittest.cc
index 4d17003..a942662 100644
--- a/api/rtcstatscollector_unittest.cc
+++ b/api/rtcstatscollector_unittest.cc
@@ -101,7 +101,7 @@
 namespace {
 
 const int64_t kGetStatsReportTimeoutMs = 1000;
-const bool kDefaultRtcpEnabled = false;
+const bool kDefaultRtcpMuxRequired = true;
 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",
-      kDefaultRtcpEnabled, kDefaultSrtpRequired);
+      kDefaultRtcpMuxRequired, kDefaultSrtpRequired);
 
   MockVideoMediaChannel* video_media_channel = new MockVideoMediaChannel();
   cricket::VideoChannel video_channel(
       test_->worker_thread(), test_->network_thread(), nullptr,
-      video_media_channel, "VideoContentName", kDefaultRtcpEnabled,
+      video_media_channel, "VideoContentName", kDefaultRtcpMuxRequired,
       kDefaultSrtpRequired);
 
   // Audio
@@ -1446,7 +1446,7 @@
   cricket::VoiceChannel voice_channel(
       test_->worker_thread(), test_->network_thread(), nullptr,
       test_->media_engine(), voice_media_channel, "VoiceContentName",
-      kDefaultRtcpEnabled, kDefaultSrtpRequired);
+      kDefaultRtcpMuxRequired, 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", kDefaultRtcpEnabled,
+      video_media_channel, "VideoContentName", kDefaultRtcpMuxRequired,
       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",
-      kDefaultRtcpEnabled, kDefaultSrtpRequired);
+      kDefaultRtcpMuxRequired, 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", kDefaultRtcpEnabled,
+      video_media_channel, "VideoContentName", kDefaultRtcpMuxRequired,
       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",
-      kDefaultRtcpEnabled, kDefaultSrtpRequired);
+      kDefaultRtcpMuxRequired, kDefaultSrtpRequired);
   MockVideoMediaChannel* video_media_channel = new MockVideoMediaChannel();
   cricket::VideoChannel video_channel(
       test_->worker_thread(), test_->network_thread(), nullptr,
-      video_media_channel, "VideoContentName", kDefaultRtcpEnabled,
+      video_media_channel, "VideoContentName", kDefaultRtcpMuxRequired,
       kDefaultSrtpRequired);
 
   cricket::VoiceMediaInfo voice_media_info;