move //media/capture to //device/capture

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 20be47fc6978e4da627e0388d2ce9385dac02cd3..8fb5e86abcf50dcaeb7e683a0ba6425884cb5f4b 100644
--- a/content/browser/renderer_host/media/video_capture_manager.h
+++ b/content/browser/renderer_host/media/video_capture_manager.h
@@ -29,9 +29,9 @@
 #include "content/browser/renderer_host/media/video_capture_controller_event_handler.h"
 #include "content/common/content_export.h"
 #include "content/common/media/media_stream_options.h"
+#include "device/capture/video/video_capture_device.h"
+#include "device/capture/video/video_capture_device_factory.h"
 #include "media/base/video_capture_types.h"
-#include "media/capture/video/video_capture_device.h"
-#include "media/capture/video/video_capture_device_factory.h"
 
 #if defined(OS_ANDROID)
 #include "base/android/application_status_listener.h"
@@ -44,14 +44,14 @@ class VideoCaptureControllerEventHandler;
 // VideoCaptureManager opens/closes and start/stops video capture devices.
 class CONTENT_EXPORT VideoCaptureManager : public MediaStreamProvider {
  public:
-  using VideoCaptureDevice = media::VideoCaptureDevice;
+  using VideoCaptureDevice = device::VideoCaptureDevice;
 
   // Callback used to signal the completion of a controller lookup.
   using DoneCB =
       base::Callback<void(const base::WeakPtr<VideoCaptureController>&)>;
 
   explicit VideoCaptureManager(
-      std::unique_ptr<media::VideoCaptureDeviceFactory> factory);
+      std::unique_ptr<device::VideoCaptureDeviceFactory> factory);
 
   void Unregister();
 
@@ -140,7 +140,7 @@ class CONTENT_EXPORT VideoCaptureManager : public MediaStreamProvider {
                                  gfx::NativeViewId window_id);
 
   // Gets a weak reference to the device factory, used for tests.
-  media::VideoCaptureDeviceFactory* video_capture_device_factory() const {
+  device::VideoCaptureDeviceFactory* video_capture_device_factory() const {
     return video_capture_device_factory_.get();
   }
 
@@ -181,8 +181,8 @@ class CONTENT_EXPORT VideoCaptureManager : public MediaStreamProvider {
   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;
+  using VideoCaptureDeviceDescriptor = device::VideoCaptureDeviceDescriptor;
+  using VideoCaptureDeviceDescriptors = device::VideoCaptureDeviceDescriptors;
 
   ~VideoCaptureManager() override;
 
@@ -271,9 +271,8 @@ class CONTENT_EXPORT VideoCaptureManager : public MediaStreamProvider {
   void DoStopDeviceOnDeviceThread(std::unique_ptr<VideoCaptureDevice> device);
 
   void MaybePostDesktopCaptureWindowId(media::VideoCaptureSessionId session_id);
-  void SetDesktopCaptureWindowIdOnDeviceThread(
-      media::VideoCaptureDevice* device,
-      gfx::NativeViewId window_id);
+  void SetDesktopCaptureWindowIdOnDeviceThread(VideoCaptureDevice* device,
+                                               gfx::NativeViewId window_id);
 
 #if defined(OS_MACOSX)
   // Called on the IO thread after the device layer has been initialized on Mac.
@@ -326,7 +325,7 @@ class CONTENT_EXPORT VideoCaptureManager : public MediaStreamProvider {
 
   // Device creation factory injected on construction from MediaStreamManager or
   // from the test harness.
-  std::unique_ptr<media::VideoCaptureDeviceFactory>
+  std::unique_ptr<device::VideoCaptureDeviceFactory>
       video_capture_device_factory_;
 
   // Local cache of the enumerated video capture devices' names and capture