Remove BaseChannel's dependency on TransportController.

webrtc/pc/channelmanager.h

Index: webrtc/pc/channelmanager.h
diff --git a/webrtc/pc/channelmanager.h b/webrtc/pc/channelmanager.h
index 3022eca8aa36cf4d0d5b3b28c5d9bf1b482fc063..89af44afeea59a6a7d0503a53e03997884ebf7b9 100644
--- a/webrtc/pc/channelmanager.h
+++ b/webrtc/pc/channelmanager.h
@@ -90,7 +90,9 @@ class ChannelManager {
   // Creates a voice channel, to be associated with the specified session.
   VoiceChannel* CreateVoiceChannel(
       webrtc::MediaControllerInterface* media_controller,
-      TransportController* transport_controller,
+      TransportChannel* rtp_transport,
+      TransportChannel* rtcp_transport,
+      rtc::Thread* signaling_thread,
       const std::string& content_name,
       const std::string* bundle_transport_name,
       bool rtcp,
@@ -102,7 +104,9 @@ class ChannelManager {
   // associated with the specified session.
   VideoChannel* CreateVideoChannel(
       webrtc::MediaControllerInterface* media_controller,
-      TransportController* transport_controller,
+      TransportChannel* rtp_transport,
+      TransportChannel* rtcp_transport,
+      rtc::Thread* signaling_thread,
       const std::string& content_name,
       const std::string* bundle_transport_name,
       bool rtcp,
@@ -112,7 +116,9 @@ class ChannelManager {
   void DestroyVideoChannel(VideoChannel* video_channel);
   RtpDataChannel* CreateRtpDataChannel(
       webrtc::MediaControllerInterface* media_controller,
-      TransportController* transport_controller,
+      TransportChannel* rtp_transport,
+      TransportChannel* rtcp_transport,
+      rtc::Thread* signaling_thread,
       const std::string& content_name,
       const std::string* bundle_transport_name,
       bool rtcp,
@@ -161,7 +167,9 @@ class ChannelManager {
   bool SetCryptoOptions_w(const rtc::CryptoOptions& crypto_options);
   VoiceChannel* CreateVoiceChannel_w(
       webrtc::MediaControllerInterface* media_controller,
-      TransportController* transport_controller,
+      TransportChannel* rtp_transport,
+      TransportChannel* rtcp_transport,
+      rtc::Thread* signaling_thread,
       const std::string& content_name,
       const std::string* bundle_transport_name,
       bool rtcp,
@@ -170,7 +178,9 @@ class ChannelManager {
   void DestroyVoiceChannel_w(VoiceChannel* voice_channel);
   VideoChannel* CreateVideoChannel_w(
       webrtc::MediaControllerInterface* media_controller,
-      TransportController* transport_controller,
+      TransportChannel* rtp_transport,
+      TransportChannel* rtcp_transport,
+      rtc::Thread* signaling_thread,
       const std::string& content_name,
       const std::string* bundle_transport_name,
       bool rtcp,
@@ -179,7 +189,9 @@ class ChannelManager {
   void DestroyVideoChannel_w(VideoChannel* video_channel);
   RtpDataChannel* CreateRtpDataChannel_w(
       webrtc::MediaControllerInterface* media_controller,
-      TransportController* transport_controller,
+      TransportChannel* rtp_transport,
+      TransportChannel* rtcp_transport,
+      rtc::Thread* signaling_thread,
       const std::string& content_name,
       const std::string* bundle_transport_name,
       bool rtcp,