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

content/browser/renderer_host/media/video_capture_manager.h

   // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // VideoCaptureManager is used to open/close, start/stop, enumerate available
 // video capture devices, and manage VideoCaptureController's.
 // All functions are expected to be called from Browser::IO thread. Some helper
 // functions (*OnDeviceThread) will dispatch operations to the device thread.
 // VideoCaptureManager will open OS dependent instances of VideoCaptureDevice.
 // A device can only be opened once.
@@ skipping 156 matching lines @@
   // is hidden, see http://crbug.com/582295.
   void OnApplicationStateChange(base::android::ApplicationState state);
 #endif
 
   using EnumerationCallback =
       base::Callback<void(const media::VideoCaptureDeviceDescriptors&)>;
   void EnumerateDevices(const EnumerationCallback& client_callback);
 
  private:
   class CaptureDeviceStartRequest;
-  struct DeviceEntry;
+  class DeviceEntry;
   struct DeviceInfo;
 
   using SessionMap = std::map<media::VideoCaptureSessionId, MediaStreamDevice>;
   using DeviceEntries = std::vector<std::unique_ptr<DeviceEntry>>;
   using DeviceInfos = std::vector<DeviceInfo>;
   using DeviceStartQueue = std::list<CaptureDeviceStartRequest>;
   using VideoCaptureDeviceDescriptor = media::VideoCaptureDeviceDescriptor;
   using VideoCaptureDeviceDescriptors = media::VideoCaptureDeviceDescriptors;
 
   ~VideoCaptureManager() override;
@@ skipping 44 matching lines @@
 
   // Starting a capture device can take 1-2 seconds.
   // To avoid multiple unnecessary start/stop commands to the OS, each start
   // request is queued in |device_start_queue_|.
   // QueueStartDevice creates a new entry in |device_start_queue_| and posts a
   // request to start the device on the device thread unless there is
   // another request pending start.
   void QueueStartDevice(media::VideoCaptureSessionId session_id,
                         DeviceEntry* entry,
                         const media::VideoCaptureParams& params);
-  void OnDeviceStarted(
-      int serial_id,
-      std::unique_ptr<media::FrameBufferPool> frame_buffer_pool,
-      std::unique_ptr<VideoCaptureDevice> device);
+  void OnDeviceStarted(int serial_id,
+                       std::unique_ptr<VideoCaptureDevice> device);
   void DoStopDevice(DeviceEntry* entry);
   void HandleQueuedStartRequest();
 
   // Creates and Starts a new VideoCaptureDevice. The resulting
   // VideoCaptureDevice is returned to the IO-thread and stored in
   // a DeviceEntry in |devices_|. Ownership of |client| passes to
   // the device.
   std::unique_ptr<VideoCaptureDevice> DoStartDeviceCaptureOnDeviceThread(
       const VideoCaptureDeviceDescriptor& descriptor,
       const media::VideoCaptureParams& params,
@@ skipping 79 matching lines @@
   // Map used by DesktopCapture.
   std::map<media::VideoCaptureSessionId, gfx::NativeViewId>
       notification_window_ids_;
 
   DISALLOW_COPY_AND_ASSIGN(VideoCaptureManager);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_RENDERER_HOST_MEDIA_VIDEO_CAPTURE_MANAGER_H_