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

device/capture/video/video_capture_device.h

Index: device/capture/video/video_capture_device.h
diff --git a/media/capture/video/video_capture_device.h b/device/capture/video/video_capture_device.h
similarity index 90%
rename from media/capture/video/video_capture_device.h
rename to device/capture/video/video_capture_device.h
index cbdc8adde4c6e44dd2d764957a6873c267d02109..b89efd2144cbd32e8fc45952e62b16c9735afba1 100644
--- a/media/capture/video/video_capture_device.h
+++ b/device/capture/video/video_capture_device.h
@@ -9,8 +9,8 @@
 // VideoCaptureManager. Capturing is done on other threads, depending on the OS
 // specific implementation.
 
-#ifndef MEDIA_CAPTURE_VIDEO_VIDEO_CAPTURE_DEVICE_H_
-#define MEDIA_CAPTURE_VIDEO_VIDEO_CAPTURE_DEVICE_H_
+#ifndef DEVICE_CAPTURE_VIDEO_VIDEO_CAPTURE_DEVICE_H_
+#define DEVICE_CAPTURE_VIDEO_VIDEO_CAPTURE_DEVICE_H_
 
 #include <stddef.h>
 #include <stdint.h>
@@ -26,11 +26,11 @@
 #include "base/single_thread_task_runner.h"
 #include "base/time/time.h"
 #include "build/build_config.h"
+#include "device/capture/capture_export.h"
+#include "device/capture/video/scoped_result_callback.h"
+#include "device/capture/video/video_capture_device_descriptor.h"
 #include "media/base/video_capture_types.h"
 #include "media/base/video_frame.h"
-#include "media/capture/capture_export.h"
-#include "media/capture/video/scoped_result_callback.h"
-#include "media/capture/video/video_capture_device_descriptor.h"
 #include "media/mojo/interfaces/image_capture.mojom.h"
 #include "mojo/public/cpp/bindings/array.h"
 #include "ui/gfx/gpu_memory_buffer.h"
@@ -39,7 +39,15 @@ namespace tracked_objects {
 class Location;
 }  // namespace tracked_objects
 
-namespace media {
+namespace device {
+
+using media::VideoCaptureFormat;
+using media::VideoCaptureFormats;
+using media::VideoCaptureParams;
+using media::VideoFrame;
+using media::VideoFrameMetadata;
+using media::VideoPixelFormat;
+using media::VideoPixelStorage;
 
 class CAPTURE_EXPORT VideoCaptureDevice {
  public:
@@ -181,33 +189,33 @@ class CAPTURE_EXPORT VideoCaptureDevice {
   virtual void StopAndDeAllocate() = 0;
 
   // Retrieve the photo capabilities of the device (e.g. zoom levels etc).
-  using GetPhotoCapabilitiesCallback =
-      ScopedResultCallback<base::Callback<void(mojom::PhotoCapabilitiesPtr)>>;
+  using GetPhotoCapabilitiesCallback = ScopedResultCallback<
+      base::Callback<void(media::mojom::PhotoCapabilitiesPtr)>>;
   virtual void GetPhotoCapabilities(GetPhotoCapabilitiesCallback callback);
 
   using SetPhotoOptionsCallback =
       ScopedResultCallback<base::Callback<void(bool)>>;
-  virtual void SetPhotoOptions(mojom::PhotoSettingsPtr settings,
+  virtual void SetPhotoOptions(media::mojom::PhotoSettingsPtr settings,
                                SetPhotoOptionsCallback callback);
 
   // Asynchronously takes a photo, possibly reconfiguring the capture objects
   // and/or interrupting the capture flow. Runs |callback| on the thread
   // where TakePhoto() is called, if the photo was successfully taken.
   using TakePhotoCallback =
-      ScopedResultCallback<base::Callback<void(mojom::BlobPtr blob)>>;
+      ScopedResultCallback<base::Callback<void(media::mojom::BlobPtr blob)>>;
   virtual void TakePhoto(TakePhotoCallback callback);
 
   // Gets the power line frequency, either from the params if specified by the
   // user or from the current system time zone.
-  PowerLineFrequency GetPowerLineFrequency(
+  media::PowerLineFrequency GetPowerLineFrequency(
       const VideoCaptureParams& params) const;
 
  private:
   // Gets the power line frequency from the current system time zone if this is
   // defined, otherwise returns 0.
-  PowerLineFrequency GetPowerLineFrequencyForLocation() const;
+  media::PowerLineFrequency GetPowerLineFrequencyForLocation() const;
 };
 
-}  // namespace media
+}  // namespace device
 
-#endif  // MEDIA_CAPTURE_VIDEO_VIDEO_CAPTURE_DEVICE_H_
+#endif  // DEVICE_CAPTURE_VIDEO_VIDEO_CAPTURE_DEVICE_H_