Revert of New rtc::VideoSinkInterface.

talk/app/webrtc/videosource.cc

Index: talk/app/webrtc/videosource.cc
diff --git a/talk/app/webrtc/videosource.cc b/talk/app/webrtc/videosource.cc
index 8006c583b6f7f00fac9b6b39d18401f33f06ef57..4b371e3ed58e771809905c4450b519e12b056d7f 100644
--- a/talk/app/webrtc/videosource.cc
+++ b/talk/app/webrtc/videosource.cc
@@ -436,21 +436,19 @@
     SetState(kEnded);
     return;
   }
-  for (auto* sink : sinks_) {
-    channel_manager_->AddVideoSink(video_capturer_.get(), sink);
-  }
-}
-
-void VideoSource::AddSink(
-    rtc::VideoSinkInterface<cricket::VideoFrame>* output) {
+  for(cricket::VideoRenderer* sink : sinks_) {
+    channel_manager_->AddVideoRenderer(video_capturer_.get(), sink);
+  }
+}
+
+void VideoSource::AddSink(cricket::VideoRenderer* output) {
   sinks_.push_back(output);
-  channel_manager_->AddVideoSink(video_capturer_.get(), output);
-}
-
-void VideoSource::RemoveSink(
-    rtc::VideoSinkInterface<cricket::VideoFrame>* output) {
+  channel_manager_->AddVideoRenderer(video_capturer_.get(), output);
+}
+
+void VideoSource::RemoveSink(cricket::VideoRenderer* output) {
   sinks_.remove(output);
-  channel_manager_->RemoveVideoSink(video_capturer_.get(), output);
+  channel_manager_->RemoveVideoRenderer(video_capturer_.get(), output);
 }
 
 // OnStateChange listens to the ChannelManager::SignalVideoCaptureStateChange.