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

content/browser/media/capture/aura_window_capture_machine.cc

Index: content/browser/media/capture/aura_window_capture_machine.cc
diff --git a/content/browser/media/capture/aura_window_capture_machine.cc b/content/browser/media/capture/aura_window_capture_machine.cc
index 392190e1fe49068f8f7a497f1286fd6845c15c19..733f995e8007050dac00f217f8973399a88e3ade 100644
--- a/content/browser/media/capture/aura_window_capture_machine.cc
+++ b/content/browser/media/capture/aura_window_capture_machine.cc
@@ -15,11 +15,11 @@
 #include "content/browser/compositor/image_transport_factory.h"
 #include "content/browser/media/capture/desktop_capture_device_uma_types.h"
 #include "content/public/browser/browser_thread.h"
+#include "device/capture/content/thread_safe_capture_oracle.h"
+#include "device/capture/content/video_capture_oracle.h"
 #include "device/power_save_blocker/power_save_blocker.h"
 #include "media/base/video_capture_types.h"
 #include "media/base/video_util.h"
-#include "media/capture/content/thread_safe_capture_oracle.h"
-#include "media/capture/content/video_capture_oracle.h"
 #include "skia/ext/image_operations.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/aura/client/screen_position_client.h"
@@ -43,7 +43,7 @@ AuraWindowCaptureMachine::AuraWindowCaptureMachine()
 AuraWindowCaptureMachine::~AuraWindowCaptureMachine() {}
 
 void AuraWindowCaptureMachine::Start(
-  const scoped_refptr<media::ThreadSafeCaptureOracle>& oracle_proxy,
+  const scoped_refptr<device::ThreadSafeCaptureOracle>& oracle_proxy,
   const media::VideoCaptureParams& params,
   const base::Callback<void(bool)> callback) {
   // Starts the capture machine asynchronously.
@@ -58,7 +58,7 @@ void AuraWindowCaptureMachine::Start(
 }
 
 bool AuraWindowCaptureMachine::InternalStart(
-    const scoped_refptr<media::ThreadSafeCaptureOracle>& oracle_proxy,
+    const scoped_refptr<device::ThreadSafeCaptureOracle>& oracle_proxy,
     const media::VideoCaptureParams& params) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
@@ -170,18 +170,18 @@ void AuraWindowCaptureMachine::Capture(base::TimeTicks event_time) {
     return;
 
   scoped_refptr<media::VideoFrame> frame;
-  media::ThreadSafeCaptureOracle::CaptureFrameCallback capture_frame_cb;
+  device::ThreadSafeCaptureOracle::CaptureFrameCallback capture_frame_cb;
 
   // TODO(miu): Need to fix this so the compositor is providing the presentation
   // timestamps and damage regions, to leverage the frame timestamp rewriting
   // logic.  http://crbug.com/492839
   const base::TimeTicks start_time = base::TimeTicks::Now();
-  media::VideoCaptureOracle::Event event;
+  device::VideoCaptureOracle::Event event;
   if (event_time.is_null()) {
-    event = media::VideoCaptureOracle::kActiveRefreshRequest;
+    event = device::VideoCaptureOracle::kActiveRefreshRequest;
     event_time = start_time;
   } else {
-    event = media::VideoCaptureOracle::kCompositorUpdate;
+    event = device::VideoCaptureOracle::kCompositorUpdate;
   }
   if (oracle_proxy_->ObserveEventAndDecideCapture(
           event, gfx::Rect(), event_time, &frame, &capture_frame_cb)) {
@@ -320,7 +320,7 @@ bool AuraWindowCaptureMachine::ProcessCopyOutputResponse(
 }
 
 using CaptureFrameCallback =
-    media::ThreadSafeCaptureOracle::CaptureFrameCallback;
+    device::ThreadSafeCaptureOracle::CaptureFrameCallback;
 
 void AuraWindowCaptureMachine::CopyOutputFinishedForVideo(
     base::WeakPtr<AuraWindowCaptureMachine> machine,