Replace VideoCaptureDataCallback by 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 a6c4b5ca37f31be6714436d1da5d577e4dc1a6df..c4dae6556d6c6642d29ab0123932fbb9378f2268 100644
--- a/webrtc/test/vcm_capturer.h
+++ b/webrtc/test/vcm_capturer.h
@@ -20,7 +20,9 @@
 namespace webrtc {
 namespace test {
 
-class VcmCapturer : public VideoCapturer, public VideoCaptureDataCallback {
+class VcmCapturer
+    : public VideoCapturer,
+      public rtc::VideoSinkInterface<VideoFrame> {
  public:
   static VcmCapturer* Create(size_t width, size_t height, size_t target_fps);
   virtual ~VcmCapturer();
@@ -31,9 +33,7 @@ class VcmCapturer : public VideoCapturer, public VideoCaptureDataCallback {
                        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;
+  void OnFrame(const VideoFrame& frame) override;
 
  private:
   VcmCapturer();