MediaController/Call instantiation.

talk/session/media/channelmanager.h

Index: talk/session/media/channelmanager.h
diff --git a/talk/session/media/channelmanager.h b/talk/session/media/channelmanager.h
index 81cb3eed61e591e3d8c0b3bc9ac457d8125f496d..3bfef84de2915328c514e3e7d149753557fcbf90 100644
--- a/talk/session/media/channelmanager.h
+++ b/talk/session/media/channelmanager.h
@@ -40,6 +40,9 @@
 #include "webrtc/base/sigslotrepeater.h"
 #include "webrtc/base/thread.h"
 
+namespace webrtc {
+class MediaControllerInterface;
+}
 namespace cricket {
 
 const int kDefaultAudioDelayOffset = 0;
@@ -81,6 +84,8 @@ class ChannelManager : public rtc::MessageHandler,
     return true;
   }
 
+  MediaEngineInterface* media_engine() { return media_engine_.get(); }
+
   // Gets capabilities. Can be called prior to starting the media engine.
   int GetCapabilities();
 
@@ -102,25 +107,22 @@ class ChannelManager : public rtc::MessageHandler,
   // The operations below all occur on the worker thread.
 
   // Creates a voice channel, to be associated with the specified session.
-  VoiceChannel* CreateVoiceChannel(BaseSession* session,
-                                   const std::string& content_name,
-                                   bool rtcp,
-                                   const AudioOptions& options);
+  VoiceChannel* CreateVoiceChannel(
+      webrtc::MediaControllerInterface* media_controller,
+      BaseSession* session,
+      const std::string& content_name,
+      bool rtcp,
+      const AudioOptions& options);
   // Destroys a voice channel created with the Create API.
-  void DestroyVoiceChannel(VoiceChannel* voice_channel,
-                           VideoChannel* video_channel);
-  // TODO(pbos): Remove as soon as all call sites specify VideoOptions.
-  VideoChannel* CreateVideoChannel(BaseSession* session,
-                                   const std::string& content_name,
-                                   bool rtcp,
-                                   VoiceChannel* voice_channel);
+  void DestroyVoiceChannel(VoiceChannel* voice_channel);
   // Creates a video channel, synced with the specified voice channel, and
   // associated with the specified session.
-  VideoChannel* CreateVideoChannel(BaseSession* session,
-                                   const std::string& content_name,
-                                   bool rtcp,
-                                   const VideoOptions& options,
-                                   VoiceChannel* voice_channel);
+  VideoChannel* CreateVideoChannel(
+      webrtc::MediaControllerInterface* media_controller,
+      BaseSession* session,
+      const std::string& content_name,
+      bool rtcp,
+      const VideoOptions& options);
   // Destroys a video channel created with the Create API.
   void DestroyVideoChannel(VideoChannel* video_channel);
   DataChannel* CreateDataChannel(
@@ -247,17 +249,19 @@ class ChannelManager : public rtc::MessageHandler,
   bool InitMediaEngine_w();
   void DestructorDeletes_w();
   void Terminate_w();
-  VoiceChannel* CreateVoiceChannel_w(BaseSession* session,
-                                     const std::string& content_name,
-                                     bool rtcp,
-                                     const AudioOptions& options);
-  void DestroyVoiceChannel_w(VoiceChannel* voice_channel,
-                             VideoChannel* video_channel);
-  VideoChannel* CreateVideoChannel_w(BaseSession* session,
-                                     const std::string& content_name,
-                                     bool rtcp,
-                                     const VideoOptions& options,
-                                     VoiceChannel* voice_channel);
+  VoiceChannel* CreateVoiceChannel_w(
+      webrtc::MediaControllerInterface* media_controller,
+      BaseSession* session,
+      const std::string& content_name,
+      bool rtcp,
+      const AudioOptions& options);
+  void DestroyVoiceChannel_w(VoiceChannel* voice_channel);
+  VideoChannel* CreateVideoChannel_w(
+      webrtc::MediaControllerInterface* media_controller,
+      BaseSession* session,
+      const std::string& content_name,
+      bool rtcp,
+      const VideoOptions& options);
   void DestroyVideoChannel_w(VideoChannel* video_channel);
   DataChannel* CreateDataChannel_w(
       BaseSession* session, const std::string& content_name,