Introduce struct MediaConfig, with construction-time settings.

talk/app/webrtc/mediacontroller.cc

Index: talk/app/webrtc/mediacontroller.cc
diff --git a/talk/app/webrtc/mediacontroller.cc b/talk/app/webrtc/mediacontroller.cc
index 24f5877483b0752c9e8e5e85566981701a948232..56936ef59914f7dc8a6f7abfa1186b28792c648f 100644
--- a/talk/app/webrtc/mediacontroller.cc
+++ b/talk/app/webrtc/mediacontroller.cc
@@ -31,6 +31,7 @@
 #include "webrtc/base/bind.h"
 #include "webrtc/base/checks.h"
 #include "webrtc/call.h"
+#include "webrtc/media/base/mediachannel.h"
 
 namespace {
 
@@ -41,9 +42,12 @@ const int kMaxBandwidthBps = 2000000;
 class MediaController : public webrtc::MediaControllerInterface,
                         public sigslot::has_slots<> {
  public:
-  MediaController(rtc::Thread* worker_thread,
+  MediaController(const cricket::MediaConfig& config,
+                  rtc::Thread* worker_thread,
                   cricket::ChannelManager* channel_manager)
-      : worker_thread_(worker_thread), channel_manager_(channel_manager) {
+    : worker_thread_(worker_thread),
+      config_(config),
+      channel_manager_(channel_manager) {
     RTC_DCHECK(nullptr != worker_thread);
     worker_thread_->Invoke<void>(
         rtc::Bind(&MediaController::Construct_w, this,
@@ -61,6 +65,9 @@ class MediaController : public webrtc::MediaControllerInterface,
   cricket::ChannelManager* channel_manager() const override {
     return channel_manager_;
   }
+  const cricket::MediaConfig& config() const override {
+    return config_;
+  }
 
  private:
   void Construct_w(cricket::MediaEngineInterface* media_engine) {
@@ -79,6 +86,7 @@ class MediaController : public webrtc::MediaControllerInterface,
   }
 
   rtc::Thread* const worker_thread_;
+  const cricket::MediaConfig config_;
   cricket::ChannelManager* const channel_manager_;
   rtc::scoped_ptr<webrtc::Call> call_;
 
@@ -89,8 +97,9 @@ class MediaController : public webrtc::MediaControllerInterface,
 namespace webrtc {
 
 MediaControllerInterface* MediaControllerInterface::Create(
+    const cricket::MediaConfig& config,
     rtc::Thread* worker_thread,
     cricket::ChannelManager* channel_manager) {
-  return new MediaController(worker_thread, channel_manager);
+  return new MediaController(config, worker_thread, channel_manager);
 }
 }  // namespace webrtc