Replace VideoCaptureDataCallback by VideoSinkInterface.

webrtc/media/engine/fakewebrtcvcmfactory.h

Index: webrtc/media/engine/fakewebrtcvcmfactory.h
diff --git a/webrtc/media/engine/fakewebrtcvcmfactory.h b/webrtc/media/engine/fakewebrtcvcmfactory.h
index daa2f774f5f34c1148202f2403e3f3b020ee85d6..3124cd8fcb4e246e191ba1fcdda45d9cec80fc42 100644
--- a/webrtc/media/engine/fakewebrtcvcmfactory.h
+++ b/webrtc/media/engine/fakewebrtcvcmfactory.h
@@ -22,16 +22,14 @@
 class FakeWebRtcVcmFactory : public cricket::WebRtcVcmFactoryInterface {
  public:
   virtual rtc::scoped_refptr<webrtc::VideoCaptureModule> Create(
-      int module_id,
       const char* device_id) {
     if (!device_info.GetDeviceById(device_id)) return NULL;
     rtc::scoped_refptr<FakeWebRtcVideoCaptureModule> module(
-        new rtc::RefCountedObject<FakeWebRtcVideoCaptureModule>(this,
-                                                                module_id));
+        new rtc::RefCountedObject<FakeWebRtcVideoCaptureModule>(this));
     modules.push_back(module);
     return module;

[nisse-webrtc, 2016/12/01 14:21:12]

This piece of code really wants reference counting; we can't keep a list of
created objects and at the same time give away ownership.

It's a pretty large change to drop reference counting from VideoCaptureModule,
so I'd prefer to not do that in this cl.

For this code, I much prefer changes that can delete lots of code to other types
of changes. Ultimately, we really should cut away most of these layers.

   }
-  virtual webrtc::VideoCaptureModule::DeviceInfo* CreateDeviceInfo(int id) {
+  virtual webrtc::VideoCaptureModule::DeviceInfo* CreateDeviceInfo() {
     return &device_info;
   }
   virtual void DestroyDeviceInfo(webrtc::VideoCaptureModule::DeviceInfo* info) {