Delete FrameInput method and FrameInputWrapper class.

talk/app/webrtc/videotrack_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 59 matching lines @@
   rtc::scoped_refptr<VideoTrackInterface> video_track_;
 };
 
 // Test adding renderers to a video track and render to them by providing
 // frames to the source.
 TEST_F(VideoTrackTest, RenderVideo) {
   // FakeVideoTrackRenderer register itself to |video_track_|
   rtc::scoped_ptr<FakeVideoTrackRenderer> renderer_1(
       new FakeVideoTrackRenderer(video_track_.get()));
 
-  cricket::VideoRenderer* renderer_input =
-      video_track_->GetSource()->FrameInput();
+  rtc::VideoSinkInterface<cricket::VideoFrame>* renderer_input =
+      video_track_->GetSink();
   ASSERT_FALSE(renderer_input == NULL);
 
   cricket::WebRtcVideoFrame frame;
   frame.InitToBlack(123, 123, 0);
-  renderer_input->RenderFrame(&frame);
+  renderer_input->OnFrame(frame);
   EXPECT_EQ(1, renderer_1->num_rendered_frames());
 
   EXPECT_EQ(123, renderer_1->width());
   EXPECT_EQ(123, renderer_1->height());
 
   // FakeVideoTrackRenderer register itself to |video_track_|
   rtc::scoped_ptr<FakeVideoTrackRenderer> renderer_2(
       new FakeVideoTrackRenderer(video_track_.get()));
 
-  renderer_input->RenderFrame(&frame);
+  renderer_input->OnFrame(frame);
 
   EXPECT_EQ(123, renderer_1->width());
   EXPECT_EQ(123, renderer_1->height());
   EXPECT_EQ(123, renderer_2->width());
   EXPECT_EQ(123, renderer_2->height());
 
   EXPECT_EQ(2, renderer_1->num_rendered_frames());
   EXPECT_EQ(1, renderer_2->num_rendered_frames());
 
   video_track_->RemoveRenderer(renderer_1.get());
-  renderer_input->RenderFrame(&frame);
+  renderer_input->OnFrame(frame);
 
   EXPECT_EQ(2, renderer_1->num_rendered_frames());
   EXPECT_EQ(2, renderer_2->num_rendered_frames());
 }
 
 // Test that disabling the track results in blacked out frames.
 TEST_F(VideoTrackTest, DisableTrackBlackout) {
   rtc::scoped_ptr<FakeVideoTrackRenderer> renderer(
       new FakeVideoTrackRenderer(video_track_.get()));
 
-  cricket::VideoRenderer* renderer_input =
-      video_track_->GetSource()->FrameInput();
+  rtc::VideoSinkInterface<cricket::VideoFrame>* renderer_input =
+      video_track_->GetSink();
   ASSERT_FALSE(renderer_input == NULL);
 
   cricket::WebRtcVideoFrame frame;
   frame.InitToBlack(100, 200, 0);
   // Make it not all-black
   frame.GetUPlane()[0] = 0;
 
-  renderer_input->RenderFrame(&frame);
+  renderer_input->OnFrame(frame);
   EXPECT_EQ(1, renderer->num_rendered_frames());
   EXPECT_FALSE(renderer->black_frame());
   EXPECT_EQ(100, renderer->width());
   EXPECT_EQ(200, renderer->height());
 
   video_track_->set_enabled(false);
-  renderer_input->RenderFrame(&frame);
+  renderer_input->OnFrame(frame);
   EXPECT_EQ(2, renderer->num_rendered_frames());
   EXPECT_TRUE(renderer->black_frame());
   EXPECT_EQ(100, renderer->width());
   EXPECT_EQ(200, renderer->height());
 
   video_track_->set_enabled(true);
-  renderer_input->RenderFrame(&frame);
+  renderer_input->OnFrame(frame);
   EXPECT_EQ(3, renderer->num_rendered_frames());
   EXPECT_FALSE(renderer->black_frame());
   EXPECT_EQ(100, renderer->width());
   EXPECT_EQ(200, renderer->height());
 }