Reland Replace interface VideoCapturerInput with VideoSinkInterface.

webrtc/test/vcm_capturer.h

Index: webrtc/test/vcm_capturer.h
diff --git a/webrtc/test/vcm_capturer.h b/webrtc/test/vcm_capturer.h
index 65916ec52e14327ac1560b7b7cf6c489773885e5..a6c4b5ca37f31be6714436d1da5d577e4dc1a6df 100644
--- a/webrtc/test/vcm_capturer.h
+++ b/webrtc/test/vcm_capturer.h
@@ -22,29 +22,31 @@ namespace test {
 
 class VcmCapturer : public VideoCapturer, public VideoCaptureDataCallback {
  public:
-  static VcmCapturer* Create(VideoCaptureInput* input,
-                             size_t width,
-                             size_t height,
-                             size_t target_fps);
+  static VcmCapturer* Create(size_t width, size_t height, size_t target_fps);
   virtual ~VcmCapturer();
 
   void Start() override;
   void Stop() override;
+  void AddOrUpdateSink(rtc::VideoSinkInterface<VideoFrame>* sink,
+                       const rtc::VideoSinkWants& wants) override;
+  void RemoveSink(rtc::VideoSinkInterface<VideoFrame>* sink) override;
 
   void OnIncomingCapturedFrame(const int32_t id,
                                const VideoFrame& frame) override;  // NOLINT
   void OnCaptureDelayChanged(const int32_t id, const int32_t delay) override;
 
  private:
-  explicit VcmCapturer(VideoCaptureInput* input);
+  VcmCapturer();
   bool Init(size_t width, size_t height, size_t target_fps);
   void Destroy();
 
   rtc::CriticalSection crit_;
   bool started_ GUARDED_BY(crit_);
+  rtc::VideoSinkInterface<VideoFrame>* sink_ GUARDED_BY(crit_);
   rtc::scoped_refptr<VideoCaptureModule> vcm_;
   VideoCaptureCapability capability_;
 };
+
 }  // test
 }  // webrtc