Split out dscp option from VideoOptions to new struct MediaChannelOptions.

talk/media/base/fakemediaengine.h

Index: talk/media/base/fakemediaengine.h
diff --git a/talk/media/base/fakemediaengine.h b/talk/media/base/fakemediaengine.h
index c17ab28b1bd18e0cdf52ac1b3b24ad6af577ed61..f457053125a1e2ae98a193369862c9088d554c07 100644
--- a/talk/media/base/fakemediaengine.h
+++ b/talk/media/base/fakemediaengine.h
@@ -732,12 +732,13 @@ class FakeVoiceEngine : public FakeBaseEngine {
   }
 
   VoiceMediaChannel* CreateChannel(webrtc::Call* call,
-                                   const AudioOptions& options) {
+                                   const MediaChannelOptions& options,
+                                   const AudioOptions& audio_options) {
     if (fail_create_channel_) {
       return nullptr;
     }
 
-    FakeVoiceMediaChannel* ch = new FakeVoiceMediaChannel(this, options);
+    FakeVoiceMediaChannel* ch = new FakeVoiceMediaChannel(this, audio_options);
     channels_.push_back(ch);
     return ch;
   }
@@ -795,12 +796,13 @@ class FakeVideoEngine : public FakeBaseEngine {
   }
 
   VideoMediaChannel* CreateChannel(webrtc::Call* call,
-                                   const VideoOptions& options) {
+                                   const MediaChannelOptions& options,
+                                   const VideoOptions& video_options) {
     if (fail_create_channel_) {
       return NULL;
     }
 
-    FakeVideoMediaChannel* ch = new FakeVideoMediaChannel(this, options);
+    FakeVideoMediaChannel* ch = new FakeVideoMediaChannel(this, video_options);
     channels_.push_back(ch);
     return ch;
   }