Removing "crypto_required" from MediaContentDescription.

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 e4c311836776be9b633a0ef663901cc6110e2d20..ddd0ab6f5d66e3d6c59e5e587f6f34aae57963a1 100644
--- a/webrtc/api/rtcstatscollector_unittest.cc
+++ b/webrtc/api/rtcstatscollector_unittest.cc
@@ -101,6 +101,8 @@ void PrintTo(const RTCTransportStats& stats, ::std::ostream* os) {
 namespace {
 
 const int64_t kGetStatsReportTimeoutMs = 1000;
+const bool kDefaultUseRtcpChannel = false;

[pthatcher1, 2016/11/30 19:16:17]

"bool rtcp" in BaseChannel is really "rtcp_enabled_", which means "Is RTCP used
at all by this type of channel?"
(https://cs.chromium.org/chromium/src/third_party/webrtc/pc/channel.h?sq=packa...)

So this should probably be called kDefaultRtcpEnabled. 

[Taylor Brandstetter, 2016/12/01 02:41:34]

Done. I'm just bad at naming things.

+const bool kDefaultSecureRequired = true;
 
 struct CertificateInfo {
   rtc::scoped_refptr<rtc::RTCCertificate> certificate;
@@ -785,12 +787,14 @@ TEST_F(RTCStatsCollectorTest, CollectRTCCodecStats) {
   MockVoiceMediaChannel* voice_media_channel = new MockVoiceMediaChannel();
   cricket::VoiceChannel voice_channel(
       test_->worker_thread(), test_->network_thread(), test_->media_engine(),
-      voice_media_channel, nullptr, "VoiceContentName", false);
+      voice_media_channel, nullptr, "VoiceContentName", kDefaultUseRtcpChannel,
+      kDefaultSecureRequired);
 
   MockVideoMediaChannel* video_media_channel = new MockVideoMediaChannel();
   cricket::VideoChannel video_channel(
       test_->worker_thread(), test_->network_thread(), video_media_channel,
-      nullptr, "VideoContentName", false);
+      nullptr, "VideoContentName", kDefaultUseRtcpChannel,
+      kDefaultSecureRequired);
 
   // Audio
   cricket::VoiceMediaInfo voice_media_info;
@@ -1403,7 +1407,8 @@ TEST_F(RTCStatsCollectorTest, CollectRTCInboundRTPStreamStats_Audio) {
   MockVoiceMediaChannel* voice_media_channel = new MockVoiceMediaChannel();
   cricket::VoiceChannel voice_channel(
       test_->worker_thread(), test_->network_thread(), test_->media_engine(),
-      voice_media_channel, nullptr, "VoiceContentName", false);
+      voice_media_channel, nullptr, "VoiceContentName", kDefaultUseRtcpChannel,
+      kDefaultSecureRequired);
 
   cricket::VoiceMediaInfo voice_media_info;
 
@@ -1471,7 +1476,8 @@ TEST_F(RTCStatsCollectorTest, CollectRTCInboundRTPStreamStats_Video) {
   MockVideoMediaChannel* video_media_channel = new MockVideoMediaChannel();
   cricket::VideoChannel video_channel(
       test_->worker_thread(), test_->network_thread(), video_media_channel,
-      nullptr, "VideoContentName", false);
+      nullptr, "VideoContentName", kDefaultUseRtcpChannel,
+      kDefaultSecureRequired);
 
   cricket::VideoMediaInfo video_media_info;
 
@@ -1543,7 +1549,8 @@ TEST_F(RTCStatsCollectorTest, CollectRTCOutboundRTPStreamStats_Audio) {
   MockVoiceMediaChannel* voice_media_channel = new MockVoiceMediaChannel();
   cricket::VoiceChannel voice_channel(
       test_->worker_thread(), test_->network_thread(), test_->media_engine(),
-      voice_media_channel, nullptr, "VoiceContentName", false);
+      voice_media_channel, nullptr, "VoiceContentName", kDefaultUseRtcpChannel,
+      kDefaultSecureRequired);
 
   cricket::VoiceMediaInfo voice_media_info;
 
@@ -1608,7 +1615,8 @@ TEST_F(RTCStatsCollectorTest, CollectRTCOutboundRTPStreamStats_Video) {
   MockVideoMediaChannel* video_media_channel = new MockVideoMediaChannel();
   cricket::VideoChannel video_channel(
       test_->worker_thread(), test_->network_thread(), video_media_channel,
-      nullptr, "VideoContentName", false);
+      nullptr, "VideoContentName", kDefaultUseRtcpChannel,
+      kDefaultSecureRequired);
 
   cricket::VideoMediaInfo video_media_info;