Split out dscp option from VideoOptions to new struct MediaChannelOptions.

talk/session/media/channel_unittest.cc

Index: talk/session/media/channel_unittest.cc
diff --git a/talk/session/media/channel_unittest.cc b/talk/session/media/channel_unittest.cc
index 5bbe1e7d8c936a41606bb869aacd2cb5cc58b9f7..4dcfc5b46cffed7e49ea9c8df9236f9398ba3f29 100644
--- a/talk/session/media/channel_unittest.cc
+++ b/talk/session/media/channel_unittest.cc
@@ -143,9 +143,12 @@ class ChannelTest : public testing::Test, public sigslot::has_slots<> {
         media_info_callbacks2_() {}
 
   void CreateChannels(int flags1, int flags2) {
-    CreateChannels(new typename T::MediaChannel(NULL, typename T::Options()),
-                   new typename T::MediaChannel(NULL, typename T::Options()),
-                   flags1, flags2, rtc::Thread::Current());
+    CreateChannels(
+        new typename T::MediaChannel(NULL, cricket::MediaChannelOptions(),
+                                     typename T::Options()),
+        new typename T::MediaChannel(NULL, cricket::MediaChannelOptions(),
+                                     typename T::Options()),
+        flags1, flags2, rtc::Thread::Current());
   }
   void CreateChannels(
       typename T::MediaChannel* ch1, typename T::MediaChannel* ch2,
@@ -956,7 +959,10 @@ class ChannelTest : public testing::Test, public sigslot::has_slots<> {
   void TestCallTeardownRtcpMux() {
     class LastWordMediaChannel : public T::MediaChannel {
      public:
-      LastWordMediaChannel() : T::MediaChannel(NULL, typename T::Options()) {}
+      LastWordMediaChannel()
+          : T::MediaChannel(NULL,
+                            cricket::MediaChannelOptions(),
+                            typename T::Options()) {}
       ~LastWordMediaChannel() {
         T::MediaChannel::SendRtp(kPcmuFrame, sizeof(kPcmuFrame),
                                  rtc::PacketOptions());