Revert of [Mojo Video Capture] Decouple VCController from VCBufferPool and VCDeviceClient

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 e5612673aa8901422ef242e9db9cbd1336e8e9ff..dc0b77fb4f48e0817898e350515df779bfda6f42 100644
--- a/media/capture/video/video_capture_device.h
+++ b/media/capture/video/video_capture_device.h
@@ -40,15 +40,6 @@
 }  // namespace tracked_objects
 
 namespace media {
-
-class CAPTURE_EXPORT FrameBufferPool {
- public:
-  virtual ~FrameBufferPool() {}
-
-  virtual void SetBufferHold(int buffer_id) = 0;
-  virtual void ReleaseBufferHold(int buffer_id) = 0;
-  virtual mojo::ScopedSharedBufferHandle GetHandleForTransit(int buffer_id) = 0;
-};
 
 class CAPTURE_EXPORT VideoFrameConsumerFeedbackObserver {
  public:
@@ -157,10 +148,11 @@
     // |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& format,
-                                          base::TimeTicks reference_time,
-                                          base::TimeDelta timestamp) = 0;
+    virtual void OnIncomingCapturedBuffer(
+        std::unique_ptr<Buffer> buffer,
+        const VideoCaptureFormat& frame_format,
+        base::TimeTicks reference_time,
+        base::TimeDelta timestamp) = 0;
     virtual void OnIncomingCapturedVideoFrame(
         std::unique_ptr<Buffer> buffer,
         scoped_refptr<VideoFrame> frame) = 0;