Split out dscp option from VideoOptions to new struct MediaChannelOptions.

talk/app/webrtc/webrtcsession_unittest.cc

Index: talk/app/webrtc/webrtcsession_unittest.cc
diff --git a/talk/app/webrtc/webrtcsession_unittest.cc b/talk/app/webrtc/webrtcsession_unittest.cc
index c553165f9b57f523e965d3d82efbee3fb37461b2..6ed2bfaac3ec701a5695f6aa273ae83b8e89ebf6 100644
--- a/talk/app/webrtc/webrtcsession_unittest.cc
+++ b/talk/app/webrtc/webrtcsession_unittest.cc
@@ -57,6 +57,7 @@
 #include "webrtc/base/thread.h"
 #include "webrtc/base/virtualsocketserver.h"
 #include "webrtc/media/base/fakemediaengine.h"
+#include "webrtc/media/base/fakenetworkinterface.h"
 #include "webrtc/media/base/fakevideorenderer.h"
 #include "webrtc/media/base/mediachannel.h"
 #include "webrtc/media/webrtc/fakewebrtccall.h"
@@ -4089,10 +4090,15 @@ TEST_F(WebRtcSessionTest, TestDscpConstraint) {
 
   ASSERT_TRUE(video_channel_ != NULL);
   ASSERT_TRUE(voice_channel_ != NULL);
-  const cricket::AudioOptions& audio_options = voice_channel_->options();
-  const cricket::VideoOptions& video_options = video_channel_->options();
-  EXPECT_EQ(rtc::Optional<bool>(true), audio_options.dscp);
-  EXPECT_EQ(rtc::Optional<bool>(true), video_options.dscp);
+
+  cricket::FakeNetworkInterface video_network_interface;
+  cricket::FakeNetworkInterface voice_network_interface;
+  video_channel_->SetInterface(&video_network_interface);
+  voice_channel_->SetInterface(&voice_network_interface);
+  EXPECT_EQ(rtc::DSCP_AF41, video_network_interface.dscp());
+  EXPECT_EQ(rtc::DSCP_EF, voice_network_interface.dscp());
+  video_channel_->SetInterface(NULL);
+  voice_channel_->SetInterface(NULL);
 }
 
 TEST_F(WebRtcSessionTest, TestSuspendBelowMinBitrateConstraint) {