Reland [Mojo Video Capture] Decouple VCController from VCBufferPool and VCDeviceClient

content/browser/renderer_host/media/video_capture_manager.h

Index: content/browser/renderer_host/media/video_capture_manager.h
diff --git a/content/browser/renderer_host/media/video_capture_manager.h b/content/browser/renderer_host/media/video_capture_manager.h
index e6857c662a5b6ca10fc009b810f940c8f5d48c17..3bad7b152eec3d3684cbef086c07acd447fccfa2 100644
--- a/content/browser/renderer_host/media/video_capture_manager.h
+++ b/content/browser/renderer_host/media/video_capture_manager.h
@@ -174,7 +174,7 @@ class CONTENT_EXPORT VideoCaptureManager : public MediaStreamProvider {
 
  private:
   class CaptureDeviceStartRequest;
-  class DeviceEntry;
+  struct DeviceEntry;
   struct DeviceInfo;
 
   using SessionMap = std::map<media::VideoCaptureSessionId, MediaStreamDevice>;
@@ -239,8 +239,10 @@ class CONTENT_EXPORT VideoCaptureManager : public MediaStreamProvider {
   void QueueStartDevice(media::VideoCaptureSessionId session_id,
                         DeviceEntry* entry,
                         const media::VideoCaptureParams& params);
-  void OnDeviceStarted(int serial_id,
-                       std::unique_ptr<VideoCaptureDevice> device);
+  void OnDeviceStarted(
+      int serial_id,
+      std::unique_ptr<media::FrameBufferPool> frame_buffer_pool,
+      std::unique_ptr<VideoCaptureDevice> device);
   void DoStopDevice(DeviceEntry* entry);
   void HandleQueuedStartRequest();