Revert of TransportController refactoring.

talk/session/media/channelmanager.h

 /*
  * libjingle
  * Copyright 2004 Google Inc.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *
  *  1. Redistributions of source code must retain the above copyright notice,
  *     this list of conditions and the following disclaimer.
  *  2. Redistributions in binary form must reproduce the above copyright notice,
@@ skipping 87 matching lines @@
   void GetSupportedDataCodecs(std::vector<DataCodec>* codecs) const;
 
   // Indicates whether the media engine is started.
   bool initialized() const { return initialized_; }
   // Starts up the media engine.
   bool Init();
   // Shuts down the media engine.
   void Terminate();
 
   // The operations below all occur on the worker thread.
+
   // Creates a voice channel, to be associated with the specified session.
   VoiceChannel* CreateVoiceChannel(
       webrtc::MediaControllerInterface* media_controller,
-      TransportController* transport_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);
   // Creates a video channel, synced with the specified voice channel, and
   // associated with the specified session.
   VideoChannel* CreateVideoChannel(
       webrtc::MediaControllerInterface* media_controller,
-      TransportController* transport_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(TransportController* transport_controller,
-                                 const std::string& content_name,
-                                 bool rtcp,
-                                 DataChannelType data_channel_type);
+  DataChannel* CreateDataChannel(
+      BaseSession* session, const std::string& content_name,
+      bool rtcp, DataChannelType data_channel_type);
   // Destroys a data channel created with the Create API.
   void DestroyDataChannel(DataChannel* data_channel);
 
   // Indicates whether any channels exist.
   bool has_channels() const {
     return (!voice_channels_.empty() || !video_channels_.empty());
   }
 
   // Configures the audio and video devices. A null pointer can be passed to
   // GetAudioOptions() for any parameter of no interest.
@@ skipping 103 matching lines @@
   void Construct(MediaEngineInterface* me,
                  DataEngineInterface* dme,
                  DeviceManagerInterface* dm,
                  CaptureManager* cm,
                  rtc::Thread* worker_thread);
   bool InitMediaEngine_w();
   void DestructorDeletes_w();
   void Terminate_w();
   VoiceChannel* CreateVoiceChannel_w(
       webrtc::MediaControllerInterface* media_controller,
-      TransportController* transport_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,
-      TransportController* transport_controller,
+      BaseSession* session,
       const std::string& content_name,
       bool rtcp,
       const VideoOptions& options);
   void DestroyVideoChannel_w(VideoChannel* video_channel);
-  DataChannel* CreateDataChannel_w(TransportController* transport_controller,
-                                   const std::string& content_name,
-                                   bool rtcp,
-                                   DataChannelType data_channel_type);
+  DataChannel* CreateDataChannel_w(
+      BaseSession* session, const std::string& content_name,
+      bool rtcp, DataChannelType data_channel_type);
   void DestroyDataChannel_w(DataChannel* data_channel);
   bool SetAudioOptions_w(const AudioOptions& options, int delay_offset,
                          const Device* in_dev, const Device* out_dev);
   bool SetCaptureDevice_w(const Device* cam_device);
   void OnVideoCaptureStateChange(VideoCapturer* capturer,
                                  CaptureState result);
   void GetSupportedFormats_w(
       VideoCapturer* capturer,
       std::vector<cricket::VideoFormat>* out_formats) const;
   bool IsScreencastRunning_w() const;
@@ skipping 29 matching lines @@
   // but selected devices while this sting will be empty or contain current
   // selected device.
   // TODO(hellner): refactor the code such that there is no need to keep two
   // strings for video devices that have subtle differences in behavior.
   std::string video_device_name_;
 };
 
 }  // namespace cricket
 
 #endif  // TALK_SESSION_MEDIA_CHANNELMANAGER_H_