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

content/browser/media/capture/image_capture_impl.cc

Index: content/browser/media/capture/image_capture_impl.cc
diff --git a/content/browser/media/capture/image_capture_impl.cc b/content/browser/media/capture/image_capture_impl.cc
index f1832e7dfa84eba17b275222ebd55be917992391..b24d4604e6a7f3cd8590b276834ca16094f6698d 100644
--- a/content/browser/media/capture/image_capture_impl.cc
+++ b/content/browser/media/capture/image_capture_impl.cc
@@ -12,8 +12,8 @@
 #include "content/browser/renderer_host/media/video_capture_manager.h"
 #include "content/common/media/media_stream_options.h"
 #include "content/public/browser/browser_thread.h"
+#include "device/capture/video/video_capture_device.h"
 #include "media/base/bind_to_current_loop.h"
-#include "media/capture/video/video_capture_device.h"
 
 namespace content {
 
@@ -68,7 +68,7 @@ void RunFailedTakePhotoCallback(const ImageCaptureImpl::TakePhotoCallback& cb) {
 void GetCapabilitiesOnIOThread(
     const std::string& source_id,
     MediaStreamManager* media_stream_manager,
-    media::ScopedResultCallback<ImageCaptureImpl::GetCapabilitiesCallback>
+    device::ScopedResultCallback<ImageCaptureImpl::GetCapabilitiesCallback>
         callback) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
 
@@ -85,7 +85,7 @@ void SetOptionsOnIOThread(
     const std::string& source_id,
     MediaStreamManager* media_stream_manager,
     media::mojom::PhotoSettingsPtr settings,
-    media::ScopedResultCallback<ImageCaptureImpl::SetOptionsCallback>
+    device::ScopedResultCallback<ImageCaptureImpl::SetOptionsCallback>
         callback) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
 
@@ -101,7 +101,8 @@ void SetOptionsOnIOThread(
 void TakePhotoOnIOThread(
     const std::string& source_id,
     MediaStreamManager* media_stream_manager,
-    media::ScopedResultCallback<ImageCaptureImpl::TakePhotoCallback> callback) {
+    device::ScopedResultCallback<ImageCaptureImpl::TakePhotoCallback>
+        callback) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
 
   const int session_id =
@@ -129,7 +130,7 @@ void ImageCaptureImpl::GetCapabilities(
     const GetCapabilitiesCallback& callback) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
-  media::ScopedResultCallback<GetCapabilitiesCallback> scoped_callback(
+  device::ScopedResultCallback<GetCapabilitiesCallback> scoped_callback(
       base::Bind(&RunGetCapabilitiesCallbackOnUIThread, callback),
       media::BindToCurrentLoop(base::Bind(&RunFailedGetCapabilitiesCallback)));
 
@@ -145,7 +146,7 @@ void ImageCaptureImpl::SetOptions(const std::string& source_id,
                                   const SetOptionsCallback& callback) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
-  media::ScopedResultCallback<SetOptionsCallback> scoped_callback(
+  device::ScopedResultCallback<SetOptionsCallback> scoped_callback(
       base::Bind(&RunSetOptionsCallbackOnUIThread, callback),
       media::BindToCurrentLoop(base::Bind(&RunFailedSetOptionsCallback)));
 
@@ -160,7 +161,7 @@ void ImageCaptureImpl::TakePhoto(const std::string& source_id,
                                  const TakePhotoCallback& callback) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
-  media::ScopedResultCallback<TakePhotoCallback> scoped_callback(
+  device::ScopedResultCallback<TakePhotoCallback> scoped_callback(
       base::Bind(&RunTakePhotoCallbackOnUIThread, callback),
       media::BindToCurrentLoop(base::Bind(&RunFailedTakePhotoCallback)));