Split out dscp option from VideoOptions to new struct MediaChannelOptions.

talk/app/webrtc/statscollector_unittest.cc

 /*
  * libjingle
  * Copyright 2014 Google Inc.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *
  *  1. Redistributions of source code must retain the above copyright notice,
  *     this list of conditions and the following disclaimer.
  *  2. Redistributions in binary form must reproduce the above copyright notice,
@@ skipping 102 matching lines @@
   MockPeerConnection()
       : rtc::RefCountedObject<webrtc::PeerConnection>(
             new FakePeerConnectionFactory()) {}
   MOCK_METHOD0(session, WebRtcSession*());
   MOCK_CONST_METHOD0(sctp_data_channels,
                      const std::vector<rtc::scoped_refptr<DataChannel>>&());
 };
 
 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*));
 };
 
 class FakeAudioProcessor : public webrtc::AudioProcessorInterface {
  public:
   FakeAudioProcessor() {}
   ~FakeAudioProcessor() {}
 
  private:
   void GetStats(AudioProcessorInterface::AudioProcessorStats* stats) override {
@@ skipping 1605 matching lines @@
   cricket::VoiceSenderInfo new_voice_sender_info;
   InitVoiceSenderInfo(&new_voice_sender_info);
   cricket::VoiceMediaInfo new_stats_read;
   reports.clear();
   SetupAndVerifyAudioTrackStats(
       new_audio_track.get(), stream_.get(), &stats, &voice_channel, kVcName,
       media_channel, &new_voice_sender_info, NULL, &new_stats_read, &reports);
 }
 
 }  // namespace webrtc