Split out dscp option from VideoOptions to new struct MediaChannelOptions.

talk/app/webrtc/webrtcsession.cc

Index: talk/app/webrtc/webrtcsession.cc
diff --git a/talk/app/webrtc/webrtcsession.cc b/talk/app/webrtc/webrtcsession.cc
index b1a7c21c7e23dc60092cd6cb790011e055f98488..21ad371bb140583db1aba7d59397b96d8e4472ea 100644
--- a/talk/app/webrtc/webrtcsession.cc
+++ b/talk/app/webrtc/webrtcsession.cc
@@ -650,13 +650,9 @@ bool WebRtcSession::Initialize(
   }
 
   // Find DSCP constraint.
-  if (FindConstraint(
-        constraints,
-        MediaConstraintsInterface::kEnableDscp,
-        &value, NULL)) {
-    audio_options_.dscp = rtc::Optional<bool>(value);
-    video_options_.dscp = rtc::Optional<bool>(value);
-  }
+  if (FindConstraint(constraints, MediaConstraintsInterface::kEnableDscp,
+                     &value, NULL))
+    channel_options_.dscp = value;
 
   // Find Suspend Below Min Bitrate constraint.
   if (FindConstraint(
@@ -1808,7 +1804,7 @@ bool WebRtcSession::CreateChannels(const SessionDescription* desc) {
 bool WebRtcSession::CreateVoiceChannel(const cricket::ContentInfo* content) {
   voice_channel_.reset(channel_manager_->CreateVoiceChannel(
       media_controller_, transport_controller_.get(), content->name, true,
-      audio_options_));
+      channel_options_, audio_options_));
   if (!voice_channel_) {
     return false;
   }
@@ -1825,7 +1821,7 @@ bool WebRtcSession::CreateVoiceChannel(const cricket::ContentInfo* content) {
 bool WebRtcSession::CreateVideoChannel(const cricket::ContentInfo* content) {
   video_channel_.reset(channel_manager_->CreateVideoChannel(
       media_controller_, transport_controller_.get(), content->name, true,
-      video_options_));
+      channel_options_, video_options_));
   if (!video_channel_) {
     return false;
   }