Move suspend_below_min_bitrate from VideoOptions to MediaConfig.

webrtc/media/engine/webrtcvideoengine2_unittest.cc

Index: webrtc/media/engine/webrtcvideoengine2_unittest.cc
diff --git a/webrtc/media/engine/webrtcvideoengine2_unittest.cc b/webrtc/media/engine/webrtcvideoengine2_unittest.cc
index 529d77b14b3a083e4917f758bf8ceb3e345c9836..c8c00b78abd607f8bb2e5fbc54d9d2b793a49339 100644
--- a/webrtc/media/engine/webrtcvideoengine2_unittest.cc
+++ b/webrtc/media/engine/webrtcvideoengine2_unittest.cc
@@ -1555,15 +1555,21 @@ TEST_F(WebRtcVideoChannel2Test, SuspendBelowMinBitrateDisabledByDefault) {
 }
 
 TEST_F(WebRtcVideoChannel2Test, SetOptionsWithSuspendBelowMinBitrate) {

[pbos-webrtc, 2016/02/29 13:20:31]

Rename test to ConfigureSuspendBelowMinBitrate, maybe.

[nisse-webrtc, 2016/02/29 15:01:07]

Renamed to SetMediaConfigSuspendBelowMinBitrate.

-  send_parameters_.options.suspend_below_min_bitrate =
-      rtc::Optional<bool>(true);
+  MediaConfig media_config = MediaConfig();
+  media_config.video.suspend_below_min_bitrate = true;
+
+  channel_.reset(
+      engine_.CreateChannel(fake_call_.get(), media_config, VideoOptions()));
+
   channel_->SetSendParameters(send_parameters_);
 
   FakeVideoSendStream* stream = AddSendStream();
   EXPECT_TRUE(stream->GetConfig().suspend_below_min_bitrate);
 
-  send_parameters_.options.suspend_below_min_bitrate =
-      rtc::Optional<bool>(false);
+  media_config.video.suspend_below_min_bitrate = false;
+  channel_.reset(
+      engine_.CreateChannel(fake_call_.get(), media_config, VideoOptions()));
+
   channel_->SetSendParameters(send_parameters_);
 
   stream = fake_call_->GetVideoSendStreams()[0];
@@ -1817,7 +1823,7 @@ void WebRtcVideoChannel2Test::TestCpuAdaptation(bool enable_overuse,
 
   MediaConfig media_config = MediaConfig();
   if (!enable_overuse) {
-    media_config.enable_cpu_overuse_detection = false;
+    media_config.video.enable_cpu_overuse_detection = false;
   }
   channel_.reset(
       engine_.CreateChannel(fake_call_.get(), media_config, VideoOptions()));