Remove MediaChannel::GetOptions().

talk/session/media/channel_unittest.cc

 /*
  * libjingle
  * Copyright 2009 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 1830 matching lines @@
   void TestSetChannelOptions() {
     CreateChannels(0, 0);
 
     cricket::AudioOptions options1;
     options1.echo_cancellation.Set(false);
     cricket::AudioOptions options2;
     options2.echo_cancellation.Set(true);
 
     channel1_->SetChannelOptions(options1);
     channel2_->SetChannelOptions(options1);
-    cricket::AudioOptions actual_options;
-    ASSERT_TRUE(media_channel1_->GetOptions(&actual_options));
-    EXPECT_EQ(options1, actual_options);
-    ASSERT_TRUE(media_channel2_->GetOptions(&actual_options));
-    EXPECT_EQ(options1, actual_options);
+    EXPECT_EQ(options1, media_channel1_->options());
+    EXPECT_EQ(options1, media_channel2_->options());
 
     channel1_->SetChannelOptions(options2);
     channel2_->SetChannelOptions(options2);
-    ASSERT_TRUE(media_channel1_->GetOptions(&actual_options));
-    EXPECT_EQ(options2, actual_options);
-    ASSERT_TRUE(media_channel2_->GetOptions(&actual_options));
-    EXPECT_EQ(options2, actual_options);
+    EXPECT_EQ(options2, media_channel1_->options());
+    EXPECT_EQ(options2, media_channel2_->options());
   }
 };
 
 // override to add NULL parameter
 template<>
 cricket::VideoChannel* ChannelTest<VideoTraits>::CreateChannel(
     rtc::Thread* thread, cricket::MediaEngineInterface* engine,
     cricket::FakeVideoMediaChannel* ch, cricket::BaseSession* session,
     bool rtcp) {
   cricket::VideoChannel* channel = new cricket::VideoChannel(
@@ skipping 51 matching lines @@
  public:
   typedef ChannelTest<VideoTraits>
   Base;
   VideoChannelTest() : Base(kH264Packet, sizeof(kH264Packet),
                             kRtcpReport, sizeof(kRtcpReport)) {
   }
 
   void TestSetChannelOptions() {
     CreateChannels(0, 0);
 
-    cricket::VideoOptions o1, o2;
+    cricket::VideoOptions o1;
     o1.video_noise_reduction.Set(true);
 
     channel1_->SetChannelOptions(o1);
     channel2_->SetChannelOptions(o1);
-    EXPECT_TRUE(media_channel1_->GetOptions(&o2));
-    EXPECT_EQ(o1, o2);
-    EXPECT_TRUE(media_channel2_->GetOptions(&o2));
-    EXPECT_EQ(o1, o2);
+    EXPECT_EQ(o1, media_channel1_->options());
+    EXPECT_EQ(o1, media_channel2_->options());
 
     o1.video_start_bitrate.Set(123);
     channel1_->SetChannelOptions(o1);
     channel2_->SetChannelOptions(o1);
-    EXPECT_TRUE(media_channel1_->GetOptions(&o2));
-    EXPECT_EQ(o1, o2);
-    EXPECT_TRUE(media_channel2_->GetOptions(&o2));
-    EXPECT_EQ(o1, o2);
+    EXPECT_EQ(o1, media_channel1_->options());
+    EXPECT_EQ(o1, media_channel2_->options());
   }
 };
 
 
 // VoiceChannelTest
 
 TEST_F(VoiceChannelTest, TestInit) {
   Base::TestInit();
   EXPECT_FALSE(media_channel1_->IsStreamMuted(0));
   EXPECT_TRUE(media_channel1_->dtmf_info_queue().empty());
@@ skipping 875 matching lines @@
   };
   rtc::Buffer payload(data, 3);
   cricket::SendDataResult result;
   ASSERT_TRUE(media_channel1_->SendData(params, payload, &result));
   EXPECT_EQ(params.ssrc,
             media_channel1_->last_sent_data_params().ssrc);
   EXPECT_EQ("foo", media_channel1_->last_sent_data());
 }
 
 // TODO(pthatcher): TestSetReceiver?