Split out dscp option from VideoOptions to new struct MediaChannelOptions.

talk/session/media/channelmanager_unittest.cc

Index: talk/session/media/channelmanager_unittest.cc
diff --git a/talk/session/media/channelmanager_unittest.cc b/talk/session/media/channelmanager_unittest.cc
index 4740f0f37dbf58c440c72947b778b244b53362c4..a4ec42a7bcd2f32f248d43ed295188d87c276372 100644
--- a/talk/session/media/channelmanager_unittest.cc
+++ b/talk/session/media/channelmanager_unittest.cc
@@ -117,13 +117,13 @@ TEST_F(ChannelManagerTest, StartupShutdownOnThread) {
 // Test that we can create and destroy a voice and video channel.
 TEST_F(ChannelManagerTest, CreateDestroyChannels) {
   EXPECT_TRUE(cm_->Init());
-  cricket::VoiceChannel* voice_channel =
-      cm_->CreateVoiceChannel(&fake_mc_, transport_controller_,
-                              cricket::CN_AUDIO, false, AudioOptions());
+  cricket::VoiceChannel* voice_channel = cm_->CreateVoiceChannel(
+      &fake_mc_, transport_controller_, cricket::CN_AUDIO, false,
+      MediaChannelOptions(), AudioOptions());
   EXPECT_TRUE(voice_channel != nullptr);
-  cricket::VideoChannel* video_channel =
-      cm_->CreateVideoChannel(&fake_mc_, transport_controller_,
-                              cricket::CN_VIDEO, false, VideoOptions());
+  cricket::VideoChannel* video_channel = cm_->CreateVideoChannel(
+      &fake_mc_, transport_controller_, cricket::CN_VIDEO, false,
+      MediaChannelOptions(), VideoOptions());
   EXPECT_TRUE(video_channel != nullptr);
   cricket::DataChannel* data_channel = cm_->CreateDataChannel(
       transport_controller_, cricket::CN_DATA, false, cricket::DCT_RTP);
@@ -142,13 +142,13 @@ TEST_F(ChannelManagerTest, CreateDestroyChannelsOnThread) {
   delete transport_controller_;
   transport_controller_ =
       new cricket::FakeTransportController(&worker_, ICEROLE_CONTROLLING);
-  cricket::VoiceChannel* voice_channel =
-      cm_->CreateVoiceChannel(&fake_mc_, transport_controller_,
-                              cricket::CN_AUDIO, false, AudioOptions());
+  cricket::VoiceChannel* voice_channel = cm_->CreateVoiceChannel(
+      &fake_mc_, transport_controller_, cricket::CN_AUDIO, false,
+      MediaChannelOptions(), AudioOptions());
   EXPECT_TRUE(voice_channel != nullptr);
-  cricket::VideoChannel* video_channel =
-      cm_->CreateVideoChannel(&fake_mc_, transport_controller_,
-                              cricket::CN_VIDEO, false, VideoOptions());
+  cricket::VideoChannel* video_channel = cm_->CreateVideoChannel(
+      &fake_mc_, transport_controller_, cricket::CN_VIDEO, false,
+      MediaChannelOptions(), VideoOptions());
   EXPECT_TRUE(video_channel != nullptr);
   cricket::DataChannel* data_channel = cm_->CreateDataChannel(
       transport_controller_, cricket::CN_DATA, false, cricket::DCT_RTP);
@@ -169,13 +169,13 @@ TEST_F(ChannelManagerTest, NoTransportChannelTest) {
   ASSERT_TRUE(transport_controller_->CreateTransportChannel_w(
                   "audio", cricket::ICE_CANDIDATE_COMPONENT_RTP) == nullptr);
 
-  cricket::VoiceChannel* voice_channel =
-      cm_->CreateVoiceChannel(&fake_mc_, transport_controller_,
-                              cricket::CN_AUDIO, false, AudioOptions());
+  cricket::VoiceChannel* voice_channel = cm_->CreateVoiceChannel(
+      &fake_mc_, transport_controller_, cricket::CN_AUDIO, false,
+      MediaChannelOptions(), AudioOptions());
   EXPECT_TRUE(voice_channel == nullptr);
-  cricket::VideoChannel* video_channel =
-      cm_->CreateVideoChannel(&fake_mc_, transport_controller_,
-                              cricket::CN_VIDEO, false, VideoOptions());
+  cricket::VideoChannel* video_channel = cm_->CreateVideoChannel(
+      &fake_mc_, transport_controller_, cricket::CN_VIDEO, false,
+      MediaChannelOptions(), VideoOptions());
   EXPECT_TRUE(video_channel == nullptr);
   cricket::DataChannel* data_channel = cm_->CreateDataChannel(
       transport_controller_, cricket::CN_DATA, false, cricket::DCT_RTP);