Remove MediaChannel::GetOptions().

talk/media/webrtc/webrtcvoiceengine_unittest.cc

 /*
  * libjingle
  * Copyright 2008 Google Inc.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *
  *  1. Redistributions of source code must retain the above copyright notice,
  *     this list of conditions and the following disclaimer.
  *  2. Redistributions in binary form must reproduce the above copyright notice,
@@ skipping 2974 matching lines @@
   webrtc::AgcConfig config = {0};
   EXPECT_EQ(0, voe_.GetAgcConfig(config));
   EXPECT_EQ(set_config.targetLeveldBOv, config.targetLeveldBOv);
   EXPECT_EQ(set_config.digitalCompressionGaindB,
             config.digitalCompressionGaindB);
   EXPECT_EQ(set_config.limiterEnable, config.limiterEnable);
 }
 
 TEST_F(WebRtcVoiceEngineTestFake, SetOptionOverridesViaChannels) {
   EXPECT_TRUE(SetupEngine());
-  rtc::scoped_ptr<cricket::VoiceMediaChannel> channel1(
-      engine_.CreateChannel(cricket::AudioOptions()));
-  rtc::scoped_ptr<cricket::VoiceMediaChannel> channel2(
-      engine_.CreateChannel(cricket::AudioOptions()));
+  rtc::scoped_ptr<cricket::WebRtcVoiceMediaChannel> channel1(
+      static_cast<cricket::WebRtcVoiceMediaChannel*>(
+          engine_.CreateChannel(cricket::AudioOptions())));
+  rtc::scoped_ptr<cricket::WebRtcVoiceMediaChannel> channel2(
+      static_cast<cricket::WebRtcVoiceMediaChannel*>(
+          engine_.CreateChannel(cricket::AudioOptions())));
 
   // Have to add a stream to make SetSend work.
   cricket::StreamParams stream1;
   stream1.ssrcs.push_back(1);
   channel1->AddSendStream(stream1);
   cricket::StreamParams stream2;
   stream2.ssrcs.push_back(2);
   channel2->AddSendStream(stream2);
 
   // AEC and AGC and NS
   cricket::AudioOptions options_all;
   options_all.echo_cancellation.Set(true);
   options_all.auto_gain_control.Set(true);
   options_all.noise_suppression.Set(true);
 
   ASSERT_TRUE(channel1->SetOptions(options_all));
   cricket::AudioOptions expected_options = options_all;
-  cricket::AudioOptions actual_options;
-  ASSERT_TRUE(channel1->GetOptions(&actual_options));
-  EXPECT_EQ(expected_options, actual_options);
+  EXPECT_EQ(expected_options, channel1->options());
   ASSERT_TRUE(channel2->SetOptions(options_all));
-  ASSERT_TRUE(channel2->GetOptions(&actual_options));
-  EXPECT_EQ(expected_options, actual_options);
+  EXPECT_EQ(expected_options, channel2->options());
 
   // unset NS
   cricket::AudioOptions options_no_ns;
   options_no_ns.noise_suppression.Set(false);
   ASSERT_TRUE(channel1->SetOptions(options_no_ns));
 
   expected_options.echo_cancellation.Set(true);
   expected_options.auto_gain_control.Set(true);
   expected_options.noise_suppression.Set(false);
-  ASSERT_TRUE(channel1->GetOptions(&actual_options));
-  EXPECT_EQ(expected_options, actual_options);
+  EXPECT_EQ(expected_options, channel1->options());
 
   // unset AGC
   cricket::AudioOptions options_no_agc;
   options_no_agc.auto_gain_control.Set(false);
   ASSERT_TRUE(channel2->SetOptions(options_no_agc));
 
   expected_options.echo_cancellation.Set(true);
   expected_options.auto_gain_control.Set(false);
   expected_options.noise_suppression.Set(true);
-  ASSERT_TRUE(channel2->GetOptions(&actual_options));
-  EXPECT_EQ(expected_options, actual_options);
+  EXPECT_EQ(expected_options, channel2->options());
 
   ASSERT_TRUE(engine_.SetOptions(options_all));
   bool ec_enabled;
   webrtc::EcModes ec_mode;
   bool agc_enabled;
   webrtc::AgcModes agc_mode;
   bool ns_enabled;
   webrtc::NsModes ns_mode;
   voe_.GetEcStatus(ec_enabled, ec_mode);
   voe_.GetAgcStatus(agc_enabled, agc_mode);
@@ skipping 38 matching lines @@
   ASSERT_TRUE(engine_.SetOptions(options_all));
   cricket::AudioOptions options_no_agc_nor_ns;
   options_no_agc_nor_ns.auto_gain_control.Set(false);
   options_no_agc_nor_ns.noise_suppression.Set(false);
   channel2->SetSend(cricket::SEND_MICROPHONE);
   channel2->SetOptions(options_no_agc_nor_ns);
 
   expected_options.echo_cancellation.Set(true);
   expected_options.auto_gain_control.Set(false);
   expected_options.noise_suppression.Set(false);
-  ASSERT_TRUE(channel2->GetOptions(&actual_options));
-  EXPECT_EQ(expected_options, actual_options);
+  EXPECT_EQ(expected_options, channel2->options());
   voe_.GetEcStatus(ec_enabled, ec_mode);
   voe_.GetAgcStatus(agc_enabled, agc_mode);
   voe_.GetNsStatus(ns_enabled, ns_mode);
   EXPECT_TRUE(ec_enabled);
   EXPECT_FALSE(agc_enabled);
   EXPECT_FALSE(ns_enabled);
 }
 
 // This test verifies DSCP settings are properly applied on voice media channel.
 TEST_F(WebRtcVoiceEngineTestFake, TestSetDscpOptions) {
@@ skipping 514 matching lines @@
   engine.Terminate();
 }
 
 // Test that we set our preferred codecs properly.
 TEST(WebRtcVoiceEngineTest, SetRecvCodecs) {
   cricket::WebRtcVoiceEngine engine;
   EXPECT_TRUE(engine.Init(rtc::Thread::Current()));
   cricket::WebRtcVoiceMediaChannel channel(&engine);
   EXPECT_TRUE(channel.SetRecvCodecs(engine.codecs()));
 }