Let clients interact with VideoCaptureDeviceClient instead of VideoCaptureDevice

media/capture/video/video_capture_device.h

Index: media/capture/video/video_capture_device.h
diff --git a/media/capture/video/video_capture_device.h b/media/capture/video/video_capture_device.h
index b662f5c48b7a9d72067c50107e13f1acd663057f..85954de987e86bfb6eef0b769beca01b706a9894 100644
--- a/media/capture/video/video_capture_device.h
+++ b/media/capture/video/video_capture_device.h
@@ -59,10 +59,11 @@ class CAPTURE_EXPORT VideoCaptureDevice {
       virtual size_t mapped_size() const = 0;
       virtual void* data(int plane) = 0;
       void* data() { return data(0); }
-      virtual ClientBuffer AsClientBuffer(int plane) = 0;
 #if defined(OS_POSIX) && !(defined(OS_MACOSX) && !defined(OS_IOS))
       virtual base::FileDescriptor AsPlatformFile() = 0;
 #endif
+      virtual bool IsBackedByVideoFrame() const = 0;
+      virtual scoped_refptr<VideoFrame> GetVideoFrame() = 0;
     };
 
     virtual ~Client() {}
@@ -109,6 +110,8 @@ class CAPTURE_EXPORT VideoCaptureDevice {
     // additional copies in the browser process.
     // See OnIncomingCapturedData for details of |reference_time| and
     // |timestamp|.
+    // TODO(chfremer): Consider removing one of the two in order to simplify the
+    // interface.
     virtual void OnIncomingCapturedBuffer(
         std::unique_ptr<Buffer> buffer,
         const VideoCaptureFormat& frame_format,