Revert of New rtc::VideoSinkInterface.

talk/app/webrtc/videosource.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 418 matching lines @@
 
 void VideoSource::Stop() {
   channel_manager_->StopVideoCapture(video_capturer_.get(), format_);
 }
 
 void VideoSource::Restart() {
   if (!channel_manager_->StartVideoCapture(video_capturer_.get(), format_)) {
     SetState(kEnded);
     return;
   }
-  for (auto* sink : sinks_) {
-    channel_manager_->AddVideoSink(video_capturer_.get(), sink);
+  for(cricket::VideoRenderer* sink : sinks_) {
+    channel_manager_->AddVideoRenderer(video_capturer_.get(), sink);
   }
 }
 
-void VideoSource::AddSink(
-    rtc::VideoSinkInterface<cricket::VideoFrame>* output) {
+void VideoSource::AddSink(cricket::VideoRenderer* output) {
   sinks_.push_back(output);
-  channel_manager_->AddVideoSink(video_capturer_.get(), output);
+  channel_manager_->AddVideoRenderer(video_capturer_.get(), output);
 }
 
-void VideoSource::RemoveSink(
-    rtc::VideoSinkInterface<cricket::VideoFrame>* 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.
 // This signal is triggered for all video capturers. Not only the one we are
 // interested in.
 void VideoSource::OnStateChange(cricket::VideoCapturer* capturer,
                                      cricket::CaptureState capture_state) {
   if (capturer == video_capturer_.get()) {
     SetState(GetReadyState(capture_state));
   }
 }
 
 void VideoSource::SetState(SourceState new_state) {
   // TODO(hbos): Temporarily disabled VERIFY due to webrtc:4776.
   // if (VERIFY(state_ != new_state)) {
   if (state_ != new_state) {
     state_ = new_state;
     FireOnChanged();
   }
 }
 
 }  // namespace webrtc