Introduce struct MediaConfig, with construction-time settings.

talk/app/webrtc/webrtcsession_unittest.cc

Index: talk/app/webrtc/webrtcsession_unittest.cc
diff --git a/talk/app/webrtc/webrtcsession_unittest.cc b/talk/app/webrtc/webrtcsession_unittest.cc
index c553165f9b57f523e965d3d82efbee3fb37461b2..564543ec803971b30459e481b1ea250c41a798a4 100644
--- a/talk/app/webrtc/webrtcsession_unittest.cc
+++ b/talk/app/webrtc/webrtcsession_unittest.cc
@@ -57,6 +57,7 @@
 #include "webrtc/base/thread.h"
 #include "webrtc/base/virtualsocketserver.h"
 #include "webrtc/media/base/fakemediaengine.h"
+#include "webrtc/media/base/fakenetworkinterface.h"
 #include "webrtc/media/base/fakevideorenderer.h"
 #include "webrtc/media/base/mediachannel.h"
 #include "webrtc/media/webrtc/fakewebrtccall.h"
@@ -363,7 +364,8 @@ class WebRtcSessionTest
                                         rtc::Thread::Current())),
         fake_call_(webrtc::Call::Config()),
         media_controller_(
-            webrtc::MediaControllerInterface::Create(rtc::Thread::Current(),
+            webrtc::MediaControllerInterface::Create(cricket::MediaConfig(),
+                                                     rtc::Thread::Current(),
                                                      channel_manager_.get())),
         tdesc_factory_(new cricket::TransportDescriptionFactory()),
         desc_factory_(
@@ -4073,28 +4075,6 @@ TEST_F(WebRtcSessionTest, TestSetRemoteOfferFailIfDtlsDisabledAndNoCrypto) {
                                        offer);
 }
 
-// This test verifies DSCP is properly applied on the media channels.
-TEST_F(WebRtcSessionTest, TestDscpConstraint) {
-  constraints_.reset(new FakeConstraints());
-  constraints_->AddOptional(
-      webrtc::MediaConstraintsInterface::kEnableDscp, true);
-  Init();
-  SendAudioVideoStream1();
-  SessionDescriptionInterface* offer = CreateOffer();
-
-  SetLocalDescriptionWithoutError(offer);
-
-  video_channel_ = media_engine_->GetVideoChannel(0);
-  voice_channel_ = media_engine_->GetVoiceChannel(0);
-
-  ASSERT_TRUE(video_channel_ != NULL);
-  ASSERT_TRUE(voice_channel_ != NULL);
-  const cricket::AudioOptions& audio_options = voice_channel_->options();
-  const cricket::VideoOptions& video_options = video_channel_->options();
-  EXPECT_EQ(rtc::Optional<bool>(true), audio_options.dscp);
-  EXPECT_EQ(rtc::Optional<bool>(true), video_options.dscp);
-}
-
 TEST_F(WebRtcSessionTest, TestSuspendBelowMinBitrateConstraint) {
   constraints_.reset(new FakeConstraints());
   constraints_->AddOptional(