Split out dscp option from VideoOptions to new struct MediaChannelOptions.

talk/session/media/channelmanager.cc

Index: talk/session/media/channelmanager.cc
diff --git a/talk/session/media/channelmanager.cc b/talk/session/media/channelmanager.cc
index 7973f5c2d695ab5a8b23aa3c3474bb0c1c7215e7..1ead090b2cf4899f092ea5b89cf1ba98d87488ea 100644
--- a/talk/session/media/channelmanager.cc
+++ b/talk/session/media/channelmanager.cc
@@ -252,10 +252,11 @@ VoiceChannel* ChannelManager::CreateVoiceChannel(
     TransportController* transport_controller,
     const std::string& content_name,
     bool rtcp,
+    const MediaChannelOptions& channel_options,
     const AudioOptions& options) {
   return worker_thread_->Invoke<VoiceChannel*>(
       Bind(&ChannelManager::CreateVoiceChannel_w, this, media_controller,
-           transport_controller, content_name, rtcp, options));
+           transport_controller, content_name, rtcp, channel_options, options));
 }
 
 VoiceChannel* ChannelManager::CreateVoiceChannel_w(
@@ -263,12 +264,13 @@ VoiceChannel* ChannelManager::CreateVoiceChannel_w(
     TransportController* transport_controller,
     const std::string& content_name,
     bool rtcp,
-    const AudioOptions& options) {
+    const MediaChannelOptions& options,
+    const AudioOptions& audio_options) {
   ASSERT(initialized_);
   ASSERT(worker_thread_ == rtc::Thread::Current());
   ASSERT(nullptr != media_controller);
-  VoiceMediaChannel* media_channel =
-      media_engine_->CreateChannel(media_controller->call_w(), options);
+  VoiceMediaChannel* media_channel = media_engine_->CreateChannel(
+      media_controller->call_w(), options, audio_options);
   if (!media_channel)
     return nullptr;
 
@@ -310,10 +312,11 @@ VideoChannel* ChannelManager::CreateVideoChannel(
     TransportController* transport_controller,
     const std::string& content_name,
     bool rtcp,
-    const VideoOptions& options) {
+    const MediaChannelOptions& options,
+    const VideoOptions& video_options) {
   return worker_thread_->Invoke<VideoChannel*>(
       Bind(&ChannelManager::CreateVideoChannel_w, this, media_controller,
-           transport_controller, content_name, rtcp, options));
+           transport_controller, content_name, rtcp, options, video_options));
 }
 
 VideoChannel* ChannelManager::CreateVideoChannel_w(
@@ -321,12 +324,13 @@ VideoChannel* ChannelManager::CreateVideoChannel_w(
     TransportController* transport_controller,
     const std::string& content_name,
     bool rtcp,
-    const VideoOptions& options) {
+    const MediaChannelOptions& options,
+    const VideoOptions& video_options) {
   ASSERT(initialized_);
   ASSERT(worker_thread_ == rtc::Thread::Current());
   ASSERT(nullptr != media_controller);
-  VideoMediaChannel* media_channel =
-      media_engine_->CreateVideoChannel(media_controller->call_w(), options);
+  VideoMediaChannel* media_channel = media_engine_->CreateVideoChannel(
+      media_controller->call_w(), options, video_options);
   if (media_channel == NULL) {
     return NULL;
   }