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

device/capture/video/android/video_capture_device_android.h

Index: device/capture/video/android/video_capture_device_android.h
diff --git a/media/capture/video/android/video_capture_device_android.h b/device/capture/video/android/video_capture_device_android.h
similarity index 86%
rename from media/capture/video/android/video_capture_device_android.h
rename to device/capture/video/android/video_capture_device_android.h
index 9a637a39eb1af496995747d86fdca0e43586bb4c..b2f4c8adb2cb62ceaa1e7110339472c68d76f10a 100644
--- a/media/capture/video/android/video_capture_device_android.h
+++ b/device/capture/video/android/video_capture_device_android.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MEDIA_CAPTURE_VIDEO_ANDROID_VIDEO_CAPTURE_DEVICE_ANDROID_H_
-#define MEDIA_CAPTURE_VIDEO_ANDROID_VIDEO_CAPTURE_DEVICE_ANDROID_H_
+#ifndef DEVICE_CAPTURE_VIDEO_ANDROID_VIDEO_CAPTURE_DEVICE_ANDROID_H_
+#define DEVICE_CAPTURE_VIDEO_ANDROID_VIDEO_CAPTURE_DEVICE_ANDROID_H_
 
 #include <jni.h>
 #include <string>
@@ -14,14 +14,14 @@
 #include "base/threading/thread.h"
 #include "base/threading/thread_checker.h"
 #include "base/time/time.h"
-#include "media/capture/capture_export.h"
-#include "media/capture/video/video_capture_device.h"
+#include "device/capture/capture_export.h"
+#include "device/capture/video/video_capture_device.h"
 
 namespace tracked_objects {
 class Location;
 }  // namespace tracked_
 
-namespace media {
+namespace device {
 
 // VideoCaptureDevice on Android. The VideoCaptureDevice API's are called
 // by VideoCaptureManager on its own thread, while OnFrameAvailable is called
@@ -32,7 +32,7 @@ class CAPTURE_EXPORT VideoCaptureDeviceAndroid : public VideoCaptureDevice {
   // Automatically generated enum to interface with Java world.
   //
   // A Java counterpart will be generated for this enum.
-  // GENERATED_JAVA_ENUM_PACKAGE: org.chromium.media
+  // GENERATED_JAVA_ENUM_PACKAGE: org.chromium.device
   enum AndroidImageFormat {
     // Android graphics ImageFormat mapping, see reference in:
     // http://developer.android.com/reference/android/graphics/ImageFormat.html
@@ -60,18 +60,18 @@ class CAPTURE_EXPORT VideoCaptureDeviceAndroid : public VideoCaptureDevice {
                         std::unique_ptr<Client> client) override;
   void StopAndDeAllocate() override;
   void GetPhotoCapabilities(GetPhotoCapabilitiesCallback callback) override;
-  void SetPhotoOptions(mojom::PhotoSettingsPtr settings,
+  void SetPhotoOptions(media::mojom::PhotoSettingsPtr settings,
                        SetPhotoOptionsCallback callback) override;
   void TakePhoto(TakePhotoCallback callback) override;
 
-  // Implement org.chromium.media.VideoCapture.nativeOnFrameAvailable.
+  // Implement org.chromium.device.VideoCapture.nativeOnFrameAvailable.
   void OnFrameAvailable(JNIEnv* env,
                         const base::android::JavaParamRef<jobject>& obj,
                         const base::android::JavaParamRef<jbyteArray>& data,
                         jint length,
                         jint rotation);
 
-  // Implement org.chromium.media.VideoCapture.nativeOnI420FrameAvailable.
+  // Implement org.chromium.device.VideoCapture.nativeOnI420FrameAvailable.
   void OnI420FrameAvailable(JNIEnv* env,
                             jobject obj,
                             jobject y_buffer,
@@ -84,12 +84,12 @@ class CAPTURE_EXPORT VideoCaptureDeviceAndroid : public VideoCaptureDevice {
                             jint height,
                             jint rotation);
 
-  // Implement org.chromium.media.VideoCapture.nativeOnError.
+  // Implement org.chromium.device.VideoCapture.nativeOnError.
   void OnError(JNIEnv* env,
                const base::android::JavaParamRef<jobject>& obj,
                const base::android::JavaParamRef<jstring>& message);
 
-  // Implement org.chromium.media.VideoCapture.nativeOnPhotoTaken.
+  // Implement org.chromium.device.VideoCapture.nativeOnPhotoTaken.
   void OnPhotoTaken(JNIEnv* env,
                     const base::android::JavaParamRef<jobject>& obj,
                     jlong callback_id,
@@ -134,6 +134,6 @@ class CAPTURE_EXPORT VideoCaptureDeviceAndroid : public VideoCaptureDevice {
   DISALLOW_IMPLICIT_CONSTRUCTORS(VideoCaptureDeviceAndroid);
 };
 
-}  // namespace media
+}  // namespace device
 
-#endif  // MEDIA_CAPTURE_VIDEO_ANDROID_VIDEO_CAPTURE_DEVICE_ANDROID_H_
+#endif  // DEVICE_CAPTURE_VIDEO_ANDROID_VIDEO_CAPTURE_DEVICE_ANDROID_H_