Replace VideoCaptureDataCallback by VideoSinkInterface.

webrtc/modules/video_capture/external/device_info_external.cc

 /*
  *  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.
  */
 
 #include "webrtc/modules/video_capture/device_info_impl.h"
 #include "webrtc/modules/video_capture/video_capture_impl.h"
 
 namespace webrtc {
 
 namespace videocapturemodule {
 
 class ExternalDeviceInfo : public DeviceInfoImpl {
  public:
-  ExternalDeviceInfo(const int32_t id)
-      : DeviceInfoImpl(id) {
-  }
+  ExternalDeviceInfo() {}
   virtual ~ExternalDeviceInfo() {}
   virtual uint32_t NumberOfDevices() { return 0; }
   virtual int32_t DisplayCaptureSettingsDialogBox(
       const char* /*deviceUniqueIdUTF8*/,
       const char* /*dialogTitleUTF8*/,
       void* /*parentWindow*/,
       uint32_t /*positionX*/,
       uint32_t /*positionY*/) { return -1; }
   virtual int32_t GetDeviceName(
       uint32_t deviceNumber,
       char* deviceNameUTF8,
       uint32_t deviceNameLength,
       char* deviceUniqueIdUTF8,
       uint32_t deviceUniqueIdUTF8Length,
       char* productUniqueIdUTF8=0,
       uint32_t productUniqueIdUTF8Length=0) {
     return -1;
   }
   virtual int32_t CreateCapabilityMap(
       const char* deviceUniqueIdUTF8) { return 0; }
   virtual int32_t Init() { return 0; }
 };
 
-VideoCaptureModule::DeviceInfo* VideoCaptureImpl::CreateDeviceInfo(
-    const int32_t id) {
-  return new ExternalDeviceInfo(id);
+VideoCaptureModule::DeviceInfo* VideoCaptureImpl::CreateDeviceInfo() {
+  return new ExternalDeviceInfo();
 }
 
 }  // namespace videocapturemodule
 
 }  // namespace webrtc