Split out dscp option from VideoOptions to new struct MediaChannelOptions.

talk/app/webrtc/statscollector_unittest.cc

Index: talk/app/webrtc/statscollector_unittest.cc
diff --git a/talk/app/webrtc/statscollector_unittest.cc b/talk/app/webrtc/statscollector_unittest.cc
index 1b16b0c4fa7914fa58b8fea5805ed02fc8a932bc..5cb97cd71bef7ddeee834b4e58a1696a5ebe90c5 100644
--- a/talk/app/webrtc/statscollector_unittest.cc
+++ b/talk/app/webrtc/statscollector_unittest.cc
@@ -120,15 +120,19 @@ class MockPeerConnection
 
 class MockVideoMediaChannel : public cricket::FakeVideoMediaChannel {
  public:
-  MockVideoMediaChannel() :
-      cricket::FakeVideoMediaChannel(NULL, cricket::VideoOptions()) {}
+  MockVideoMediaChannel()
+      : cricket::FakeVideoMediaChannel(NULL,
+                                       cricket::MediaChannelOptions(),
+                                       cricket::VideoOptions()) {}
   MOCK_METHOD1(GetStats, bool(cricket::VideoMediaInfo*));
 };
 
 class MockVoiceMediaChannel : public cricket::FakeVoiceMediaChannel {
  public:
-  MockVoiceMediaChannel() :
-      cricket::FakeVoiceMediaChannel(NULL, cricket::AudioOptions()) {}
+  MockVoiceMediaChannel()
+      : cricket::FakeVoiceMediaChannel(NULL,
+                                       cricket::MediaChannelOptions(),
+                                       cricket::AudioOptions()) {}
   MOCK_METHOD1(GetStats, bool(cricket::VoiceMediaInfo*));
 };