Refactor the relationship between BaseChannel and MediaChannel so that we send over all the paramet…

talk/session/media/channel_unittest.cc

Index: talk/session/media/channel_unittest.cc
diff --git a/talk/session/media/channel_unittest.cc b/talk/session/media/channel_unittest.cc
index 2573454b22f92f5337bc1b9fb9b8ac85f90a26d8..76cabd60e2de78a00e5d5ad402a8836a54ce6a0e 100644
--- a/talk/session/media/channel_unittest.cc
+++ b/talk/session/media/channel_unittest.cc
@@ -618,30 +618,6 @@ class ChannelTest : public testing::Test, public sigslot::has_slots<> {
     EXPECT_TRUE(channel2_->rtcp_transport_channel() != NULL);
   }
 
-  // Test that SetLocalContent and SetRemoteContent properly set
-  // video options to the media channel.
-  void TestSetContentsVideoOptions() {
-    CreateChannels(0, 0);
-    typename T::Content content;
-    CreateContent(0, kPcmuCodec, kH264Codec, &content);
-    content.set_buffered_mode_latency(101);
-    EXPECT_TRUE(channel1_->SetLocalContent(&content, CA_OFFER, NULL));
-    EXPECT_EQ(0U, media_channel1_->codecs().size());
-    cricket::VideoOptions options;
-    ASSERT_TRUE(media_channel1_->GetOptions(&options));
-    int latency = 0;
-    EXPECT_TRUE(options.buffered_mode_latency.Get(&latency));
-    EXPECT_EQ(101, latency);
-    content.set_buffered_mode_latency(102);
-    EXPECT_TRUE(channel1_->SetRemoteContent(&content, CA_ANSWER, NULL));
-    ASSERT_EQ(1U, media_channel1_->codecs().size());
-    EXPECT_TRUE(CodecMatches(content.codecs()[0],
-                             media_channel1_->codecs()[0]));
-    ASSERT_TRUE(media_channel1_->GetOptions(&options));
-    EXPECT_TRUE(options.buffered_mode_latency.Get(&latency));
-    EXPECT_EQ(102, latency);
-  }
-
   // Test that SetRemoteContent properly deals with a content update.
   void TestSetRemoteContentUpdate() {
     CreateChannels(0, 0);
@@ -2410,10 +2386,6 @@ TEST_F(VideoChannelTest, TestSetContentsRtcpMuxWithPrAnswer) {
   Base::TestSetContentsRtcpMux();
 }
 
-TEST_F(VideoChannelTest, TestSetContentsVideoOptions) {
-  Base::TestSetContentsVideoOptions();
-}
-
 TEST_F(VideoChannelTest, TestSetRemoteContentUpdate) {
   Base::TestSetRemoteContentUpdate();
 }