Revert of New rtc::VideoSinkInterface.

talk/session/media/channelmanager.h

 /*
  * libjingle
  * Copyright 2004 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 138 matching lines @@
   // When muting, produce black frames then pause the camera.
   // When unmuting, start the camera. Camera starts unmuted.
   bool MuteToBlackThenPause(VideoCapturer* video_capturer, bool muted);
   bool StopVideoCapture(VideoCapturer* video_capturer,
                         const VideoFormat& video_format);
   bool RestartVideoCapture(VideoCapturer* video_capturer,
                            const VideoFormat& previous_format,
                            const VideoFormat& desired_format,
                            CaptureManager::RestartOptions options);
 
-  virtual void AddVideoSink(VideoCapturer* video_capturer,
-                            rtc::VideoSinkInterface<VideoFrame>* sink);
-  virtual void RemoveVideoSink(VideoCapturer* video_capturer,
-                               rtc::VideoSinkInterface<VideoFrame>* sink);
+  bool AddVideoRenderer(VideoCapturer* capturer, VideoRenderer* renderer);
+  bool RemoveVideoRenderer(VideoCapturer* capturer, VideoRenderer* renderer);
   bool IsScreencastRunning() const;
 
   // The operations below occur on the main thread.
 
   // Starts AEC dump using existing file, with a specified maximum file size in
   // bytes. When the limit is reached, logging will stop and the file will be
   // closed. If max_size_bytes is set to <= 0, no limit will be used.
   bool StartAecDump(rtc::PlatformFile file, int64_t max_size_bytes);
 
   // Stops recording AEC dump.
@@ skipping 60 matching lines @@
   int audio_output_volume_;
   VideoRenderer* local_renderer_;
   bool enable_rtx_;
 
   bool capturing_;
 };
 
 }  // namespace cricket
 
 #endif  // TALK_SESSION_MEDIA_CHANNELMANAGER_H_