Drop VideoOptions from VideoSendParameters.

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 65b5c6b1e11ebed287b56b050da318527e14fc7b..6eee5b3ef52934de95bd058d49bdc2925f0316b1 100644
--- a/webrtc/media/engine/webrtcvideoengine2_unittest.cc
+++ b/webrtc/media/engine/webrtcvideoengine2_unittest.cc
@@ -1018,7 +1018,10 @@ class WebRtcVideoChannel2Test : public WebRtcVideoEngine2Test {
   FakeVideoSendStream* SetDenoisingOption(
       const cricket::VideoSendParameters& parameters, bool enabled) {
     cricket::VideoSendParameters params = parameters;
+#if 0
+    // TODO(nisse): How to pass this?
     params.options.video_noise_reduction = rtc::Optional<bool>(enabled);

[pthatcher1, 2016/02/12 20:45:38]

Probably with channel_->SetOptions or channel_->SetVideoSend.

+#endif
     channel_->SetSendParameters(params);
     return fake_call_->GetVideoSendStreams().back();
   }
@@ -1069,7 +1072,10 @@ TEST_F(WebRtcVideoChannel2Test, RecvStreamWithSimAndRtx) {
   parameters.codecs = engine_.codecs();
   EXPECT_TRUE(channel_->SetSendParameters(parameters));
   EXPECT_TRUE(channel_->SetSend(true));
+#if 0
+  // TODO(nisse): How to pass this?
   parameters.options.conference_mode = rtc::Optional<bool>(true);
+#endif
   EXPECT_TRUE(channel_->SetSendParameters(parameters));
 
   // Send side.
@@ -1458,8 +1464,11 @@ TEST_F(WebRtcVideoChannel2Test, UsesCorrectSettingsForScreencast) {
   cricket::VideoCodec codec = kVp8Codec360p;
   cricket::VideoSendParameters parameters;
   parameters.codecs.push_back(codec);
+#if 0
+  // TODO(nisse): How to pass this?
   parameters.options.screencast_min_bitrate_kbps =
       rtc::Optional<int>(kScreenshareMinBitrateKbps);

[pthatcher1, 2016/02/12 20:45:38]

Again, could go on VideoParameters directly.

+#endif
   EXPECT_TRUE(channel_->SetSendParameters(parameters));
 
   AddSendStream();
@@ -1513,7 +1522,10 @@ TEST_F(WebRtcVideoChannel2Test,
        ConferenceModeScreencastConfiguresTemporalLayer) {
   static const int kConferenceScreencastTemporalBitrateBps =
       ScreenshareLayerConfig::GetDefault().tl0_bitrate_kbps * 1000;
+#if 0
+  // TODO(nisse): How to pass this?
   send_parameters_.options.conference_mode = rtc::Optional<bool>(true);
+#endif
   channel_->SetSendParameters(send_parameters_);
 
   AddSendStream();
@@ -1551,15 +1563,20 @@ TEST_F(WebRtcVideoChannel2Test, SuspendBelowMinBitrateDisabledByDefault) {
 }
 
 TEST_F(WebRtcVideoChannel2Test, SetOptionsWithSuspendBelowMinBitrate) {
+#if 0
+  // TODO(nisse): How to pass this?
   send_parameters_.options.suspend_below_min_bitrate =
       rtc::Optional<bool>(true);
+#endif
   channel_->SetSendParameters(send_parameters_);
 
   FakeVideoSendStream* stream = AddSendStream();
   EXPECT_TRUE(stream->GetConfig().suspend_below_min_bitrate);
 
+#if 0
   send_parameters_.options.suspend_below_min_bitrate =
       rtc::Optional<bool>(false);
+#endif
   channel_->SetSendParameters(send_parameters_);
 
   stream = fake_call_->GetVideoSendStreams()[0];