Refactor the relationship between BaseChannel and MediaChannel so that we send over all the paramet…

talk/media/webrtc/webrtcvideoengine2_unittest.cc

Index: talk/media/webrtc/webrtcvideoengine2_unittest.cc
diff --git a/talk/media/webrtc/webrtcvideoengine2_unittest.cc b/talk/media/webrtc/webrtcvideoengine2_unittest.cc
index 71eebba0b0afd5e6ac95155e38100cb176a497dd..12d86ea44fd3264331692024ab810b6778544593 100644
--- a/talk/media/webrtc/webrtcvideoengine2_unittest.cc
+++ b/talk/media/webrtc/webrtcvideoengine2_unittest.cc
@@ -2182,6 +2182,8 @@ TEST_F(WebRtcVideoChannel2Test, TestSetDscpOptions) {
       new cricket::FakeNetworkInterface);
   channel_->SetInterface(network_interface.get());
   cricket::VideoOptions options;
+  EXPECT_TRUE(channel_->SetOptions(options));
+  EXPECT_EQ(rtc::DSCP_NO_CHANGE, network_interface->dscp());
   options.dscp.Set(true);
   EXPECT_TRUE(channel_->SetOptions(options));
   EXPECT_EQ(rtc::DSCP_AF41, network_interface->dscp());