Split out dscp option from VideoOptions to new struct MediaChannelOptions.

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 6f44e4259c5cbf9bbfc3d8ed2ce7174fb28035a2..4a5462ea5335f2eaa28778adc622ef869fb5614f 100644
--- a/talk/session/media/channelmanager.h
+++ b/talk/session/media/channelmanager.h
@@ -102,7 +102,8 @@ class ChannelManager : public rtc::MessageHandler,
       TransportController* transport_controller,
       const std::string& content_name,
       bool rtcp,
-      const AudioOptions& options);
+      const MediaChannelOptions& options,
+      const AudioOptions& audio_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
@@ -112,7 +113,8 @@ class ChannelManager : public rtc::MessageHandler,
       TransportController* transport_controller,
       const std::string& content_name,
       bool rtcp,
-      const VideoOptions& options);
+      const MediaChannelOptions& options,
+      const VideoOptions& video_options);
   // Destroys a video channel created with the Create API.
   void DestroyVideoChannel(VideoChannel* video_channel);
   DataChannel* CreateDataChannel(TransportController* transport_controller,
@@ -197,14 +199,16 @@ class ChannelManager : public rtc::MessageHandler,
       TransportController* transport_controller,
       const std::string& content_name,
       bool rtcp,
-      const AudioOptions& options);
+      const MediaChannelOptions& options,
+      const AudioOptions& audio_options);
   void DestroyVoiceChannel_w(VoiceChannel* voice_channel);
   VideoChannel* CreateVideoChannel_w(
       webrtc::MediaControllerInterface* media_controller,
       TransportController* transport_controller,
       const std::string& content_name,
       bool rtcp,
-      const VideoOptions& options);
+      const MediaChannelOptions& options,
+      const VideoOptions& video_options);
   void DestroyVideoChannel_w(VideoChannel* video_channel);
   DataChannel* CreateDataChannel_w(TransportController* transport_controller,
                                    const std::string& content_name,