Replace VideoCaptureDataCallback by VideoSinkInterface.

webrtc/modules/video_capture/video_capture_defines.h

Index: webrtc/modules/video_capture/video_capture_defines.h
diff --git a/webrtc/modules/video_capture/video_capture_defines.h b/webrtc/modules/video_capture/video_capture_defines.h
index ef97ecab9db478e0656f2aa271cbc1eed61bf943..5124d745acfa76d486c28741e38725e886c0cc85 100644
--- a/webrtc/modules/video_capture/video_capture_defines.h
+++ b/webrtc/modules/video_capture/video_capture_defines.h
@@ -69,12 +69,6 @@ struct VideoCaptureCapability
     }
 };
 
-enum VideoCaptureAlarm
-{
-    Raised = 0,
-    Cleared = 1
-};
-
 /* External Capture interface. Returned by Create
  and implemented by the capture module.
  */
@@ -90,29 +84,6 @@ protected:
     ~VideoCaptureExternal() {}
 };
 
-// Callback class to be implemented by module user
-class VideoCaptureDataCallback
-{
-public:
- virtual void OnIncomingCapturedFrame(const int32_t id,
-                                      const VideoFrame& videoFrame) = 0;
-    virtual void OnCaptureDelayChanged(const int32_t id,
-                                       const int32_t delay) = 0;
-protected:
-    virtual ~VideoCaptureDataCallback(){}
-};
-
-class VideoCaptureFeedBack
-{
-public:
-    virtual void OnCaptureFrameRate(const int32_t id,
-                                    const uint32_t frameRate) = 0;
-    virtual void OnNoPictureAlarm(const int32_t id,
-                                  const VideoCaptureAlarm alarm) = 0;
-protected:
-    virtual ~VideoCaptureFeedBack(){}
-};
-
 }  // namespace webrtc
 
 #endif  // WEBRTC_MODULES_VIDEO_CAPTURE_VIDEO_CAPTURE_DEFINES_H_