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

device/capture/video/android/video_capture_device_android.cc

Index: device/capture/video/android/video_capture_device_android.cc
diff --git a/media/capture/video/android/video_capture_device_android.cc b/device/capture/video/android/video_capture_device_android.cc
similarity index 93%
rename from media/capture/video/android/video_capture_device_android.cc
rename to device/capture/video/android/video_capture_device_android.cc
index 3d0774c2307a907b8e3858b12e3c1e012d02232f..ab9d39d50ab3873133f17879ffdbbb66a5543516 100644
--- a/media/capture/video/android/video_capture_device_android.cc
+++ b/device/capture/video/android/video_capture_device_android.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "media/capture/video/android/video_capture_device_android.h"
+#include "device/capture/video/android/video_capture_device_android.h"
 
 #include <stdint.h>
 #include <utility>
@@ -12,9 +12,9 @@
 #include "base/android/jni_string.h"
 #include "base/numerics/safe_conversions.h"
 #include "base/strings/string_number_conversions.h"
+#include "device/capture/video/android/photo_capabilities.h"
+#include "device/capture/video/android/video_capture_device_factory_android.h"
 #include "jni/VideoCapture_jni.h"
-#include "media/capture/video/android/photo_capabilities.h"
-#include "media/capture/video/android/video_capture_device_factory_android.h"
 #include "third_party/libyuv/include/libyuv.h"
 
 using base::android::AttachCurrentThread;
@@ -24,7 +24,7 @@ using base::android::MethodID;
 using base::android::JavaRef;
 using base::android::ScopedJavaLocalRef;
 
-namespace media {
+namespace device {
 
 // static
 bool VideoCaptureDeviceAndroid::RegisterVideoCaptureDevice(JNIEnv* env) {
@@ -167,33 +167,34 @@ void VideoCaptureDeviceAndroid::GetPhotoCapabilities(
       Java_VideoCapture_getPhotoCapabilities(env, j_capture_.obj()));
 
   // TODO(mcasas): Manual member copying sucks, consider adding typemapping from
-  // PhotoCapabilities to mojom::PhotoCapabilitiesPtr, https://crbug.com/622002.
-  mojom::PhotoCapabilitiesPtr photo_capabilities =
-      mojom::PhotoCapabilities::New();
-  photo_capabilities->iso = mojom::Range::New();
+  // PhotoCapabilities to media::mojom::PhotoCapabilitiesPtr,
+  // https://crbug.com/622002.
+  media::mojom::PhotoCapabilitiesPtr photo_capabilities =
+      media::mojom::PhotoCapabilities::New();
+  photo_capabilities->iso = media::mojom::Range::New();
   photo_capabilities->iso->current = caps.getCurrentIso();
   photo_capabilities->iso->max = caps.getMaxIso();
   photo_capabilities->iso->min = caps.getMinIso();
-  photo_capabilities->height = mojom::Range::New();
+  photo_capabilities->height = media::mojom::Range::New();
   photo_capabilities->height->current = caps.getCurrentHeight();
   photo_capabilities->height->max = caps.getMaxHeight();
   photo_capabilities->height->min = caps.getMinHeight();
-  photo_capabilities->width = mojom::Range::New();
+  photo_capabilities->width = media::mojom::Range::New();
   photo_capabilities->width->current = caps.getCurrentWidth();
   photo_capabilities->width->max = caps.getMaxWidth();
   photo_capabilities->width->min = caps.getMinWidth();
-  photo_capabilities->zoom = mojom::Range::New();
+  photo_capabilities->zoom = media::mojom::Range::New();
   photo_capabilities->zoom->current = caps.getCurrentZoom();
   photo_capabilities->zoom->max = caps.getMaxZoom();
   photo_capabilities->zoom->min = caps.getMinZoom();
   photo_capabilities->focus_mode = caps.getAutoFocusInUse()
-                                       ? mojom::FocusMode::AUTO
-                                       : mojom::FocusMode::MANUAL;
+                                       ? media::mojom::FocusMode::AUTO
+                                       : media::mojom::FocusMode::MANUAL;
   callback.Run(std::move(photo_capabilities));
 }
 
 void VideoCaptureDeviceAndroid::SetPhotoOptions(
-    mojom::PhotoSettingsPtr settings,
+    media::mojom::PhotoSettingsPtr settings,
     SetPhotoOptionsCallback callback) {
   DCHECK(thread_checker_.CalledOnValidThread());
   JNIEnv* env = AttachCurrentThread();
@@ -348,7 +349,7 @@ void VideoCaptureDeviceAndroid::OnPhotoTaken(
     return;
   }
 
-  mojom::BlobPtr blob = mojom::Blob::New();
+  media::mojom::BlobPtr blob = media::mojom::Blob::New();
   base::android::JavaByteArrayToByteVector(env, data.obj(), &blob->data);
   blob->mime_type = blob->data.empty() ? "" : "image/jpeg";
   cb->Run(std::move(blob));
@@ -385,4 +386,4 @@ void VideoCaptureDeviceAndroid::SetErrorState(
   }
 }
 
-}  // namespace media
+}  // namespace device