diff --git a/talk/media/base/videoengine_unittest.h b/talk/media/base/videoengine_unittest.h
index 00ee92923d..0f12ba3dd2 100644
--- a/talk/media/base/videoengine_unittest.h
+++ b/talk/media/base/videoengine_unittest.h
@@ -760,96 +760,6 @@ class VideoMediaChannelTest : public testing::Test,
     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() {
diff --git a/talk/media/webrtc/webrtcvideoengine2.cc b/talk/media/webrtc/webrtcvideoengine2.cc
index e6bd294bc7..f237b8fde6 100644
--- a/talk/media/webrtc/webrtcvideoengine2.cc
+++ b/talk/media/webrtc/webrtcvideoengine2.cc
@@ -1184,22 +1184,6 @@ bool WebRtcVideoChannel2::SetRenderer(uint32_t ssrc, VideoRenderer* renderer) {
   return true;
 }
 
-bool WebRtcVideoChannel2::GetRenderer(uint32_t ssrc, VideoRenderer** renderer) {
-  if (ssrc == 0) {
-    *renderer = default_unsignalled_ssrc_handler_.GetDefaultRenderer();
-    return *renderer != NULL;
-  }
-
-  rtc::CritScope stream_lock(&stream_crit_);
-  std::map<uint32_t, WebRtcVideoReceiveStream*>::iterator it =
-      receive_streams_.find(ssrc);
-  if (it == receive_streams_.end()) {
-    return false;
-  }
-  *renderer = it->second->GetRenderer();
-  return true;
-}
-
 bool WebRtcVideoChannel2::GetStats(VideoMediaInfo* info) {
   info->Clear();
   FillSenderStats(info);
@@ -2480,13 +2464,6 @@ void WebRtcVideoChannel2::WebRtcVideoReceiveStream::SetRenderer(
   renderer_ = renderer;
 }
 
-VideoRenderer* WebRtcVideoChannel2::WebRtcVideoReceiveStream::GetRenderer() {
-  // TODO(pbos): Remove GetRenderer and all uses of it, it's thread-unsafe by
-  // design.
-  rtc::CritScope crit(&renderer_lock_);
-  return renderer_;
-}
-
 std::string
 WebRtcVideoChannel2::WebRtcVideoReceiveStream::GetCodecNameFromPayloadType(
     int payload_type) {
diff --git a/talk/media/webrtc/webrtcvideoengine2.h b/talk/media/webrtc/webrtcvideoengine2.h
index e6a078bc92..eb2480c4cb 100644
--- a/talk/media/webrtc/webrtcvideoengine2.h
+++ b/talk/media/webrtc/webrtcvideoengine2.h
@@ -193,7 +193,6 @@ class WebRtcVideoChannel2 : public rtc::MessageHandler,
   // Implemented for VideoMediaChannelTest.
   bool sending() const { return sending_; }
   uint32_t GetDefaultSendChannelSsrc() { return default_send_ssrc_; }
-  bool GetRenderer(uint32_t ssrc, VideoRenderer** renderer);
 
  private:
   bool MuteStream(uint32_t ssrc, bool mute);
@@ -415,7 +414,6 @@ class WebRtcVideoChannel2 : public rtc::MessageHandler,
     bool IsDefaultStream() const;
 
     void SetRenderer(cricket::VideoRenderer* renderer);
-    cricket::VideoRenderer* GetRenderer();
 
     VideoReceiverInfo GetVideoReceiverInfo();
 
diff --git a/talk/media/webrtc/webrtcvideoengine2_unittest.cc b/talk/media/webrtc/webrtcvideoengine2_unittest.cc
index e3e21dd39f..dfff00af66 100644
--- a/talk/media/webrtc/webrtcvideoengine2_unittest.cc
+++ b/talk/media/webrtc/webrtcvideoengine2_unittest.cc
@@ -803,12 +803,9 @@ WEBRTC_BASE_TEST(SetSendSsrc);
 WEBRTC_BASE_TEST(SetSendSsrcAfterSetCodecs);
 
 WEBRTC_BASE_TEST(SetRenderer);
-WEBRTC_BASE_TEST(AddRemoveRecvStreams);
 
 WEBRTC_DISABLED_BASE_TEST(AddRemoveRecvStreamAndRender);
 
-WEBRTC_BASE_TEST(AddRemoveRecvStreamsNoConference);
-
 WEBRTC_BASE_TEST(AddRemoveSendStreams);
 
 WEBRTC_BASE_TEST(SimulateConference);