Delete GetRenderer method, used only by the tests.

talk/media/base/videoengine_unittest.h

 /*
  * libjingle
  * Copyright 2014 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 742 matching lines @@
     // Wait 30ms to guarantee the engine does not drop the frame.
     EXPECT_TRUE(WaitAndSendFrame(30));
     EXPECT_TRUE_WAIT(NumRtpPackets() > rtp_packets, kTimeout);
 
     last_packet = NumRtpPackets() - 1;
     p.reset(GetRtpPacket(static_cast<int>(last_packet)));
     ParseRtpPacket(p.get(), NULL, NULL, NULL, NULL, &ssrc, NULL);
     EXPECT_EQ(789u, ssrc);
   }
 
-  // Tests setting up and configuring multiple incoming streams.
-  void AddRemoveRecvStreams() {
-    cricket::FakeVideoRenderer renderer1, renderer2;
-    cricket::VideoSendParameters parameters;
-    parameters.codecs.push_back(DefaultCodec());
-    EXPECT_TRUE(channel_->SetSendParameters(parameters));
-
-    // Ensure we can't set the renderer on a non-existent stream.
-    EXPECT_FALSE(channel_->SetRenderer(1, &renderer1));
-    EXPECT_FALSE(channel_->SetRenderer(2, &renderer2));
-    cricket::VideoRenderer* renderer;
-    EXPECT_FALSE(channel_->GetRenderer(1, &renderer));
-    EXPECT_FALSE(channel_->GetRenderer(2, &renderer));
-
-    // Ensure we can add streams.
-    EXPECT_TRUE(channel_->AddRecvStream(
-        cricket::StreamParams::CreateLegacy(1)));
-    EXPECT_TRUE(channel_->AddRecvStream(
-        cricket::StreamParams::CreateLegacy(2)));
-    EXPECT_TRUE(channel_->GetRenderer(1, &renderer));
-    EXPECT_TRUE(renderer == NULL);
-    EXPECT_TRUE(channel_->GetRenderer(2, &renderer));
-    EXPECT_TRUE(NULL == renderer);
-
-    // Ensure we can now set the renderers.
-    EXPECT_TRUE(channel_->SetRenderer(1, &renderer1));
-    EXPECT_TRUE(channel_->SetRenderer(2, &renderer2));
-    EXPECT_TRUE(channel_->GetRenderer(1, &renderer));
-    EXPECT_TRUE(&renderer1 == renderer);
-    EXPECT_TRUE(channel_->GetRenderer(2, &renderer));
-    EXPECT_TRUE(&renderer2 == renderer);
-
-    // Ensure we can change the renderers if needed.
-    EXPECT_TRUE(channel_->SetRenderer(1, &renderer2));
-    EXPECT_TRUE(channel_->SetRenderer(2, &renderer1));
-    EXPECT_TRUE(channel_->GetRenderer(1, &renderer));
-    EXPECT_TRUE(&renderer2 == renderer);
-    EXPECT_TRUE(channel_->GetRenderer(2, &renderer));
-    EXPECT_TRUE(&renderer1 == renderer);
-
-    EXPECT_TRUE(channel_->RemoveRecvStream(2));
-    EXPECT_TRUE(channel_->RemoveRecvStream(1));
-    EXPECT_FALSE(channel_->GetRenderer(1, &renderer));
-    EXPECT_FALSE(channel_->GetRenderer(2, &renderer));
-  }
-
-  // Tests setting up and configuring multiple incoming streams in a
-  // non-conference call.
-  void AddRemoveRecvStreamsNoConference() {
-    cricket::FakeVideoRenderer renderer1, renderer2;
-    // Ensure we can't set the renderer on a non-existent stream.
-    EXPECT_FALSE(channel_->SetRenderer(1, &renderer1));
-    EXPECT_FALSE(channel_->SetRenderer(2, &renderer2));
-    cricket::VideoRenderer* renderer;
-    EXPECT_FALSE(channel_->GetRenderer(1, &renderer));
-    EXPECT_FALSE(channel_->GetRenderer(2, &renderer));
-
-    // Ensure we can add streams.
-    EXPECT_TRUE(channel_->AddRecvStream(
-        cricket::StreamParams::CreateLegacy(1)));
-    EXPECT_TRUE(channel_->AddRecvStream(
-        cricket::StreamParams::CreateLegacy(2)));
-    EXPECT_TRUE(channel_->GetRenderer(1, &renderer));
-    // Verify the first AddRecvStream hook up to the default renderer.
-    EXPECT_TRUE(renderer == NULL);
-    EXPECT_TRUE(channel_->GetRenderer(2, &renderer));
-    EXPECT_TRUE(NULL == renderer);
-
-    // Ensure we can now set the renderers.
-    EXPECT_TRUE(channel_->SetRenderer(1, &renderer1));
-    EXPECT_TRUE(channel_->SetRenderer(2, &renderer2));
-    EXPECT_TRUE(channel_->GetRenderer(1, &renderer));
-    EXPECT_TRUE(&renderer1 == renderer);
-    EXPECT_TRUE(channel_->GetRenderer(2, &renderer));
-    EXPECT_TRUE(&renderer2 == renderer);
-
-    // Ensure we can change the renderers if needed.
-    EXPECT_TRUE(channel_->SetRenderer(1, &renderer2));
-    EXPECT_TRUE(channel_->SetRenderer(2, &renderer1));
-    EXPECT_TRUE(channel_->GetRenderer(1, &renderer));
-    EXPECT_TRUE(&renderer2 == renderer);
-    EXPECT_TRUE(channel_->GetRenderer(2, &renderer));
-    EXPECT_TRUE(&renderer1 == renderer);
-
-    EXPECT_TRUE(channel_->RemoveRecvStream(2));
-    EXPECT_TRUE(channel_->RemoveRecvStream(1));
-    EXPECT_FALSE(channel_->GetRenderer(1, &renderer));
-    EXPECT_FALSE(channel_->GetRenderer(2, &renderer));
-  }
-
   // Test that no frames are rendered after the receive stream have been
   // removed.
   void AddRemoveRecvStreamAndRender() {
     cricket::FakeVideoRenderer renderer1;
     EXPECT_TRUE(SetDefaultCodec());
     EXPECT_TRUE(SetSend(true));
     EXPECT_TRUE(channel_->AddRecvStream(
         cricket::StreamParams::CreateLegacy(kSsrc)));
     EXPECT_TRUE(channel_->SetRenderer(kSsrc, &renderer1));
 
@@ skipping 604 matching lines @@
   rtc::scoped_ptr<C> channel_;
   cricket::FakeNetworkInterface network_interface_;
   cricket::FakeVideoRenderer renderer_;
   cricket::VideoMediaChannel::Error media_error_;
 
   // Used by test cases where 2 streams are run on the same channel.
   cricket::FakeVideoRenderer renderer2_;
 };
 
 #endif  // TALK_MEDIA_BASE_VIDEOENGINE_UNITTEST_H_  NOLINT