Remove BaseChannel's dependency on TransportController.

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 72d00c49acc8d108d0ba2075409100f05b5c3947..4d1700326928caa86606875e6ba0741c2f96ac9d 100644
--- a/webrtc/api/rtcstatscollector_unittest.cc
+++ b/webrtc/api/rtcstatscollector_unittest.cc
@@ -596,14 +596,15 @@ TEST_F(RTCStatsCollectorTest, CollectRTCCertificateStatsSingle) {
 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", kDefaultRtcpEnabled,
-      kDefaultSrtpRequired);
+      test_->worker_thread(), test_->network_thread(), nullptr,

[pthatcher1, 2017/01/13 21:51:07]

I'd prefer we define a signaling thread for all of these rather than making it
null.  We don't use the signaling thread right now in these tests, but it's
risky to assume that passing nullptr here is safe, when generally it isn't.   
Same for all the tests.

[Taylor Brandstetter, 2017/01/13 23:46:47]

Fixed in new CL

+      test_->media_engine(), voice_media_channel, "VoiceContentName",
+      kDefaultRtcpEnabled, kDefaultSrtpRequired);
 
   MockVideoMediaChannel* video_media_channel = new MockVideoMediaChannel();
   cricket::VideoChannel video_channel(
-      test_->worker_thread(), test_->network_thread(), video_media_channel,
-      nullptr, "VideoContentName", kDefaultRtcpEnabled, kDefaultSrtpRequired);
+      test_->worker_thread(), test_->network_thread(), nullptr,
+      video_media_channel, "VideoContentName", kDefaultRtcpEnabled,
+      kDefaultSrtpRequired);
 
   // Audio
   cricket::VoiceMediaInfo voice_media_info;
@@ -1443,9 +1444,9 @@ TEST_F(RTCStatsCollectorTest,
 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", kDefaultRtcpEnabled,
-      kDefaultSrtpRequired);
+      test_->worker_thread(), test_->network_thread(), nullptr,
+      test_->media_engine(), voice_media_channel, "VoiceContentName",
+      kDefaultRtcpEnabled, kDefaultSrtpRequired);
 
   cricket::VoiceMediaInfo voice_media_info;
 
@@ -1516,8 +1517,9 @@ TEST_F(RTCStatsCollectorTest, CollectRTCInboundRTPStreamStats_Audio) {
 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", kDefaultRtcpEnabled, kDefaultSrtpRequired);
+      test_->worker_thread(), test_->network_thread(), nullptr,
+      video_media_channel, "VideoContentName", kDefaultRtcpEnabled,
+      kDefaultSrtpRequired);
 
   cricket::VideoMediaInfo video_media_info;
 
@@ -1594,9 +1596,9 @@ TEST_F(RTCStatsCollectorTest, CollectRTCInboundRTPStreamStats_Video) {
 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", kDefaultRtcpEnabled,
-      kDefaultSrtpRequired);
+      test_->worker_thread(), test_->network_thread(), nullptr,
+      test_->media_engine(), voice_media_channel, "VoiceContentName",
+      kDefaultRtcpEnabled, kDefaultSrtpRequired);
 
   cricket::VoiceMediaInfo voice_media_info;
 
@@ -1662,8 +1664,9 @@ TEST_F(RTCStatsCollectorTest, CollectRTCOutboundRTPStreamStats_Audio) {
 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", kDefaultRtcpEnabled, kDefaultSrtpRequired);
+      test_->worker_thread(), test_->network_thread(), nullptr,
+      video_media_channel, "VideoContentName", kDefaultRtcpEnabled,
+      kDefaultSrtpRequired);
 
   cricket::VideoMediaInfo video_media_info;
 
@@ -1739,13 +1742,14 @@ TEST_F(RTCStatsCollectorTest, CollectRTCOutboundRTPStreamStats_Video) {
 TEST_F(RTCStatsCollectorTest, CollectRTCOutboundRTPStreamStats_Default) {
   MockVoiceMediaChannel* voice_media_channel = new MockVoiceMediaChannel();
   cricket::VoiceChannel voice_channel(
-      test_->worker_thread(), test_->network_thread(), test_->media_engine(),
-      voice_media_channel, nullptr, "VoiceContentName", kDefaultRtcpEnabled,
-      kDefaultSrtpRequired);
+      test_->worker_thread(), test_->network_thread(), nullptr,
+      test_->media_engine(), voice_media_channel, "VoiceContentName",
+      kDefaultRtcpEnabled, kDefaultSrtpRequired);
   MockVideoMediaChannel* video_media_channel = new MockVideoMediaChannel();
   cricket::VideoChannel video_channel(
-      test_->worker_thread(), test_->network_thread(), video_media_channel,
-      nullptr, "VideoContentName", kDefaultRtcpEnabled, kDefaultSrtpRequired);
+      test_->worker_thread(), test_->network_thread(), nullptr,
+      video_media_channel, "VideoContentName", kDefaultRtcpEnabled,
+      kDefaultSrtpRequired);
 
   cricket::VoiceMediaInfo voice_media_info;
   voice_media_info.senders.push_back(cricket::VoiceSenderInfo());