Replace VideoCaptureDataCallback by VideoSinkInterface.

webrtc/modules/video_capture/device_info_impl.h

 /*
  *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
 #ifndef WEBRTC_MODULES_VIDEO_CAPTURE_MAIN_SOURCE_DEVICE_INFO_IMPL_H_
 #define WEBRTC_MODULES_VIDEO_CAPTURE_MAIN_SOURCE_DEVICE_INFO_IMPL_H_
 
 #include <vector>
 
 #include "webrtc/modules/video_capture/video_capture.h"
 #include "webrtc/modules/video_capture/video_capture_delay.h"
 #include "webrtc/system_wrappers/include/rw_lock_wrapper.h"
 
 namespace webrtc
 {
 namespace videocapturemodule
 {
 class DeviceInfoImpl: public VideoCaptureModule::DeviceInfo
 {
 public:
-    DeviceInfoImpl(const int32_t id);
+    DeviceInfoImpl();
     virtual ~DeviceInfoImpl(void);
     virtual int32_t NumberOfCapabilities(const char* deviceUniqueIdUTF8);
     virtual int32_t GetCapability(
         const char* deviceUniqueIdUTF8,
         const uint32_t deviceCapabilityNumber,
         VideoCaptureCapability& capability);
 
     virtual int32_t GetBestMatchedCapability(
         const char* deviceUniqueIdUTF8,
         const VideoCaptureCapability& requested,
@@ skipping 11 matching lines @@
     virtual int32_t CreateCapabilityMap(const char* deviceUniqueIdUTF8)=0;
 
     /* Returns the expected Capture delay*/
     int32_t GetExpectedCaptureDelay(const DelayValues delayValues[],
                                     const uint32_t sizeOfDelayValues,
                                     const char* productId,
                                     const uint32_t width,
                                     const uint32_t height);
 protected:
     // Data members
-    int32_t _id;
     typedef std::vector<VideoCaptureCapability> VideoCaptureCapabilities;
     VideoCaptureCapabilities _captureCapabilities;
     RWLockWrapper& _apiLock;
     char* _lastUsedDeviceName;
     uint32_t _lastUsedDeviceNameLength;
 };
 }  // namespace videocapturemodule
 }  // namespace webrtc
 #endif // WEBRTC_MODULES_VIDEO_CAPTURE_MAIN_SOURCE_DEVICE_INFO_IMPL_H_