Reland Replace interface VideoCapturerInput with VideoSinkInterface.

webrtc/test/video_capturer.h

Index: webrtc/test/video_capturer.h
diff --git a/webrtc/test/video_capturer.h b/webrtc/test/video_capturer.h
index 169fd7151d656fe432c67fd5f978906b146628b0..9b761eb2a5f4b10f75d6c49a52cc47ef5a9d8740 100644
--- a/webrtc/test/video_capturer.h
+++ b/webrtc/test/video_capturer.h
@@ -12,29 +12,21 @@
 
 #include <stddef.h>
 
+#include "webrtc/media/base/videosourceinterface.h"
+#include "webrtc/video_frame.h"
+
 namespace webrtc {
 
 class Clock;
 
-class VideoCaptureInput;
-
 namespace test {
 
-class VideoCapturer {
+class VideoCapturer : public rtc::VideoSourceInterface<VideoFrame> {
  public:
-  static VideoCapturer* Create(VideoCaptureInput* input,
-                               size_t width,
-                               size_t height,
-                               int fps,
-                               Clock* clock);
   virtual ~VideoCapturer() {}
 
   virtual void Start() = 0;
   virtual void Stop() = 0;
-
- protected:
-  explicit VideoCapturer(VideoCaptureInput* input);
-  VideoCaptureInput* input_;
 };
 }  // test
 }  // webrtc