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

content/browser/media/media_internals_unittest.cc

Index: content/browser/media/media_internals_unittest.cc
diff --git a/content/browser/media/media_internals_unittest.cc b/content/browser/media/media_internals_unittest.cc
index f5edac520882387d2d88a0774cd0ef79724936f7..ec601c4daa2b8e62731285f1626358013f49388b 100644
--- a/content/browser/media/media_internals_unittest.cc
+++ b/content/browser/media/media_internals_unittest.cc
@@ -112,14 +112,13 @@ class MediaInternalsVideoCaptureDeviceTest : public testing::Test,
   MediaInternals::UpdateCallback update_cb_;
 };
 
-// TODO(chfremer): Consider removing this. This test seem be
-// a duplicate implementation of the functionality under test.
-// https://crbug.com/630694
+// TODO(chfremer): Consider removing this. This test seem to be a duplicate
+// implementation of the functionality under test. https://crbug.com/630694
 #if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \
     defined(OS_ANDROID)
 TEST_F(MediaInternalsVideoCaptureDeviceTest,
        AllCaptureApiTypesHaveProperStringRepresentation) {
-  using VideoCaptureApi = media::VideoCaptureApi;
+  using VideoCaptureApi = device::VideoCaptureApi;
   std::map<VideoCaptureApi, std::string> api_to_string_map;
   api_to_string_map[VideoCaptureApi::LINUX_V4L2_SINGLE_PLANE] = "V4L2 SPLANE";
   api_to_string_map[VideoCaptureApi::WIN_MEDIA_FOUNDATION] = "Media Foundation";
@@ -136,7 +135,7 @@ TEST_F(MediaInternalsVideoCaptureDeviceTest,
   EXPECT_EQ(static_cast<size_t>(VideoCaptureApi::UNKNOWN),
             api_to_string_map.size());
   for (const auto& map_entry : api_to_string_map) {
-    media::VideoCaptureDeviceDescriptor descriptor;
+    device::VideoCaptureDeviceDescriptor descriptor;
     descriptor.capture_api = map_entry.first;
     EXPECT_EQ(map_entry.second, descriptor.GetCaptureApiTypeString());
   }
@@ -171,26 +170,25 @@ TEST_F(MediaInternalsVideoCaptureDeviceTest,
   const int kWidth = 1280;
   const int kHeight = 720;
   const float kFrameRate = 30.0f;
-  const media::VideoPixelFormat kPixelFormat =
-      media::PIXEL_FORMAT_I420;
+  const media::VideoPixelFormat kPixelFormat = media::PIXEL_FORMAT_I420;
   const media::VideoCaptureFormat format_hd({kWidth, kHeight},
       kFrameRate, kPixelFormat);
   media::VideoCaptureFormats formats{};
   formats.push_back(format_hd);
-  media::VideoCaptureDeviceDescriptor descriptor;
+  device::VideoCaptureDeviceDescriptor descriptor;
   descriptor.device_id = "dummy";
   descriptor.display_name = "dummy";
 #if defined(OS_MACOSX)
-  descriptor.capture_api = media::VideoCaptureApi::MACOSX_AVFOUNDATION;
+  descriptor.capture_api = device::VideoCaptureApi::MACOSX_AVFOUNDATION;
 #elif defined(OS_WIN)
-  descriptor.capture_api = media::VideoCaptureApi::WIN_DIRECT_SHOW;
+  descriptor.capture_api = device::VideoCaptureApi::WIN_DIRECT_SHOW;
 #elif defined(OS_LINUX)
   descriptor.device_id = "/dev/dummy";
-  descriptor.capture_api = media::VideoCaptureApi::LINUX_V4L2_SINGLE_PLANE;
+  descriptor.capture_api = device::VideoCaptureApi::LINUX_V4L2_SINGLE_PLANE;
 #elif defined(OS_ANDROID)
-  descriptor.capture_api = media::VideoCaptureApi::ANDROID_API2_LEGACY;
+  descriptor.capture_api = device::VideoCaptureApi::ANDROID_API2_LEGACY;
 #endif
-  std::vector<std::tuple<media::VideoCaptureDeviceDescriptor,
+  std::vector<std::tuple<device::VideoCaptureDeviceDescriptor,
                          media::VideoCaptureFormats>>
       descriptors_and_formats{};
   descriptors_and_formats.push_back(std::make_tuple(descriptor, formats));