Remove MediaChannel::GetOptions().

talk/app/webrtc/webrtcsession_unittest.cc

 /*
  * libjingle
  * Copyright 2012 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 605 matching lines @@
     session_.reset();
     Init();
     mediastream_signaling_.SendAudioVideoStream1();
     SessionDescriptionInterface* offer = CreateOffer();
 
     SetLocalDescriptionWithoutError(offer);
 
     video_channel_ = media_engine_->GetVideoChannel(0);
 
     ASSERT_TRUE(video_channel_ != NULL);
-    cricket::VideoOptions video_options;
-    EXPECT_TRUE(video_channel_->GetOptions(&video_options));
+    const cricket::VideoOptions& video_options = video_channel_->options();
     EXPECT_EQ(value_expected,
         video_options.unsignalled_recv_stream_limit.GetWithDefaultIfUnset(-1));
   }
 
   void CompareIceUfragAndPassword(const cricket::SessionDescription* desc1,
                                   const cricket::SessionDescription* desc2,
                                   bool expect_equal) {
     if (desc1->contents().size() != desc2->contents().size()) {
       EXPECT_FALSE(expect_equal);
       return;
@@ skipping 3081 matching lines @@
   mediastream_signaling_.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);
-  cricket::AudioOptions audio_options;
-  EXPECT_TRUE(voice_channel_->GetOptions(&audio_options));
-  cricket::VideoOptions video_options;
-  EXPECT_TRUE(video_channel_->GetOptions(&video_options));
+  const cricket::AudioOptions& audio_options = voice_channel_->options();
+  const cricket::VideoOptions& video_options = video_channel_->options();
   EXPECT_TRUE(audio_options.dscp.IsSet());
   EXPECT_TRUE(audio_options.dscp.GetWithDefaultIfUnset(false));
   EXPECT_TRUE(video_options.dscp.IsSet());
   EXPECT_TRUE(video_options.dscp.GetWithDefaultIfUnset(false));
 }
 
 TEST_F(WebRtcSessionTest, TestSuspendBelowMinBitrateConstraint) {
   constraints_.reset(new FakeConstraints());
   constraints_->AddOptional(
       webrtc::MediaConstraintsInterface::kEnableVideoSuspendBelowMinBitrate,
       true);
   Init();
   mediastream_signaling_.SendAudioVideoStream1();
   SessionDescriptionInterface* offer = CreateOffer();
 
   SetLocalDescriptionWithoutError(offer);
 
   video_channel_ = media_engine_->GetVideoChannel(0);
 
   ASSERT_TRUE(video_channel_ != NULL);
-  cricket::VideoOptions video_options;
-  EXPECT_TRUE(video_channel_->GetOptions(&video_options));
+  const cricket::VideoOptions& video_options = video_channel_->options();
   EXPECT_TRUE(
       video_options.suspend_below_min_bitrate.GetWithDefaultIfUnset(false));
 }
 
 TEST_F(WebRtcSessionTest, TestNumUnsignalledRecvStreamsConstraint) {
   // Number of unsignalled receiving streams should be between 0 and
   // kMaxUnsignalledRecvStreams.
   SetAndVerifyNumUnsignalledRecvStreams(10, 10);
   SetAndVerifyNumUnsignalledRecvStreams(kMaxUnsignalledRecvStreams + 1,
                                         kMaxUnsignalledRecvStreams);
   SetAndVerifyNumUnsignalledRecvStreams(-1, 0);
 }
 
 TEST_F(WebRtcSessionTest, TestCombinedAudioVideoBweConstraint) {
   constraints_.reset(new FakeConstraints());
   constraints_->AddOptional(
       webrtc::MediaConstraintsInterface::kCombinedAudioVideoBwe,
       true);
   Init();
   mediastream_signaling_.SendAudioVideoStream1();
   SessionDescriptionInterface* offer = CreateOffer();
 
   SetLocalDescriptionWithoutError(offer);
 
   voice_channel_ = media_engine_->GetVoiceChannel(0);
 
   ASSERT_TRUE(voice_channel_ != NULL);
-  cricket::AudioOptions audio_options;
-  EXPECT_TRUE(voice_channel_->GetOptions(&audio_options));
+  const cricket::AudioOptions& audio_options = voice_channel_->options();
   EXPECT_TRUE(
       audio_options.combined_audio_video_bwe.GetWithDefaultIfUnset(false));
 }
 
 // Tests that we can renegotiate new media content with ICE candidates in the
 // new remote SDP.
 TEST_P(WebRtcSessionTest, TestRenegotiateNewMediaWithCandidatesInSdp) {
   MAYBE_SKIP_TEST(rtc::SSLStreamAdapter::HaveDtlsSrtp);
   InitWithDtls(GetParam());
   SetFactoryDtlsSrtp();
@@ skipping 148 matching lines @@
   }
 }
 
 // TODO(bemasc): Add a TestIceStatesBundle with BUNDLE enabled.  That test
 // currently fails because upon disconnection and reconnection OnIceComplete is
 // called more than once without returning to IceGatheringGathering.
 
 INSTANTIATE_TEST_CASE_P(
     WebRtcSessionTests, WebRtcSessionTest,
     testing::Values(ALREADY_GENERATED, DTLS_IDENTITY_STORE));