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

content/browser/media/capture/web_contents_video_capture_device_unittest.cc

Index: content/browser/media/capture/web_contents_video_capture_device_unittest.cc
diff --git a/content/browser/media/capture/web_contents_video_capture_device_unittest.cc b/content/browser/media/capture/web_contents_video_capture_device_unittest.cc
index 54e1633cf424785127439bb1baac78a8aced63c0..4d6cd1847cd12128d4d34db02565f422bcdae26e 100644
--- a/content/browser/media/capture/web_contents_video_capture_device_unittest.cc
+++ b/content/browser/media/capture/web_contents_video_capture_device_unittest.cc
@@ -325,7 +325,7 @@ class CaptureTestRenderViewHostFactory : public RenderViewHostFactory {
 
 // A stub consumer of captured video frames, which checks the output of
 // WebContentsVideoCaptureDevice.
-class StubClient : public media::VideoCaptureDevice::Client {
+class StubClient : public device::VideoCaptureDevice::Client {
  public:
   StubClient(
       const base::Callback<void(SkColor, const gfx::Size&)>& report_callback,
@@ -346,7 +346,7 @@ class StubClient : public media::VideoCaptureDevice::Client {
 
   MOCK_METHOD0(DoOnIncomingCapturedBuffer, void(void));
 
-  std::unique_ptr<media::VideoCaptureDevice::Client::Buffer>
+  std::unique_ptr<device::VideoCaptureDevice::Client::Buffer>
   ReserveOutputBuffer(const gfx::Size& dimensions,
                       media::VideoPixelFormat format,
                       media::VideoPixelStorage storage) override {
@@ -357,7 +357,7 @@ class StubClient : public media::VideoCaptureDevice::Client {
     if (buffer_id == VideoCaptureBufferPool::kInvalidId)
       return NULL;
 
-    return std::unique_ptr<media::VideoCaptureDevice::Client::Buffer>(
+    return std::unique_ptr<device::VideoCaptureDevice::Client::Buffer>(
         new AutoReleaseBuffer(
             buffer_pool_, buffer_pool_->GetBufferHandle(buffer_id), buffer_id));
   }
@@ -398,7 +398,7 @@ class StubClient : public media::VideoCaptureDevice::Client {
         frame->visible_rect().size());
   }
 
-  std::unique_ptr<media::VideoCaptureDevice::Client::Buffer>
+  std::unique_ptr<device::VideoCaptureDevice::Client::Buffer>
   ResurrectLastOutputBuffer(const gfx::Size& dimensions,
                             media::VideoPixelFormat format,
                             media::VideoPixelStorage storage) override {
@@ -407,7 +407,7 @@ class StubClient : public media::VideoCaptureDevice::Client {
         buffer_pool_->ResurrectLastForProducer(dimensions, format, storage);
     if (buffer_id == VideoCaptureBufferPool::kInvalidId)
       return nullptr;
-    return std::unique_ptr<media::VideoCaptureDevice::Client::Buffer>(
+    return std::unique_ptr<device::VideoCaptureDevice::Client::Buffer>(
         new AutoReleaseBuffer(
             buffer_pool_, buffer_pool_->GetBufferHandle(buffer_id), buffer_id));
   }
@@ -420,7 +420,7 @@ class StubClient : public media::VideoCaptureDevice::Client {
   double GetBufferPoolUtilization() const override { return 0.0; }
 
  private:
-  class AutoReleaseBuffer : public media::VideoCaptureDevice::Client::Buffer {
+  class AutoReleaseBuffer : public device::VideoCaptureDevice::Client::Buffer {
    public:
     AutoReleaseBuffer(
         const scoped_refptr<VideoCaptureBufferPool>& pool,
@@ -474,7 +474,7 @@ class StubClientObserver {
 
   virtual ~StubClientObserver() {}
 
-  std::unique_ptr<media::VideoCaptureDevice::Client> PassClient() {
+  std::unique_ptr<device::VideoCaptureDevice::Client> PassClient() {
     return std::move(client_);
   }
 
@@ -656,7 +656,7 @@ class MAYBE_WebContentsVideoCaptureDeviceTest : public testing::Test {
   // Accessors.
   CaptureTestSourceController* source() { return &controller_; }
   WebContents* web_contents() const { return web_contents_.get(); }
-  media::VideoCaptureDevice* device() { return device_.get(); }
+  device::VideoCaptureDevice* device() { return device_.get(); }
 
   // Returns the device scale factor of the capture target's native view.  This
   // is necessary because, architecturally, the TestScreen implementation is
@@ -747,7 +747,7 @@ class MAYBE_WebContentsVideoCaptureDeviceTest : public testing::Test {
 
     BrowserThread::PostTask(
         BrowserThread::UI, FROM_HERE,
-        base::Bind(&media::VideoCaptureDevice::RequestRefreshFrame,
+        base::Bind(&device::VideoCaptureDevice::RequestRefreshFrame,
                    base::Unretained(device_.get())));
   }
 
@@ -780,7 +780,7 @@ class MAYBE_WebContentsVideoCaptureDeviceTest : public testing::Test {
   std::unique_ptr<WebContents> web_contents_;
 
   // Finally, the WebContentsVideoCaptureDevice under test.
-  std::unique_ptr<media::VideoCaptureDevice> device_;
+  std::unique_ptr<device::VideoCaptureDevice> device_;
 
   TestBrowserThreadBundle thread_bundle_;
 };