Merge video_capture tests into service_unittests

services/video_capture/test/service_unittest.cc

Index: services/video_capture/test/service_unittest.cc
diff --git a/services/video_capture/test/service_unittest.cc b/services/video_capture/test/service_unittest.cc
index cffddd93a1c69f08ac6da4d64c8d3773c09decbf..9ed4625f403db351279d7ccbfcf111aaad964d17 100644
--- a/services/video_capture/test/service_unittest.cc
+++ b/services/video_capture/test/service_unittest.cc
@@ -6,7 +6,7 @@
 #include "base/run_loop.h"
 #include "base/test/mock_callback.h"
 #include "services/video_capture/public/interfaces/device_factory.mojom.h"
-#include "services/video_capture/test/service_test.h"
+#include "services/video_capture/test/video_capture_service_test.h"
 
 using testing::Exactly;
 using testing::_;
@@ -17,7 +17,8 @@ namespace video_capture {
 
 // Tests that an answer arrives from the service when calling
 // EnumerateDeviceDescriptors().
-TEST_F(ServiceTest, DISABLED_EnumerateDeviceDescriptorsCallbackArrives) {
+TEST_F(VideoCaptureServiceTest,
+       DISABLED_EnumerateDeviceDescriptorsCallbackArrives) {
   base::RunLoop wait_loop;
   EXPECT_CALL(descriptor_receiver_, Run(_))
       .Times(Exactly(1))
@@ -27,7 +28,7 @@ TEST_F(ServiceTest, DISABLED_EnumerateDeviceDescriptorsCallbackArrives) {
   wait_loop.Run();
 }
 
-TEST_F(ServiceTest, DISABLED_FakeDeviceFactoryEnumeratesOneDevice) {
+TEST_F(VideoCaptureServiceTest, DISABLED_FakeDeviceFactoryEnumeratesOneDevice) {
   base::RunLoop wait_loop;
   size_t num_devices_enumerated = 0;
   EXPECT_CALL(descriptor_receiver_, Run(_))
@@ -45,7 +46,8 @@ TEST_F(ServiceTest, DISABLED_FakeDeviceFactoryEnumeratesOneDevice) {
 
 // Tests that VideoCaptureDeviceFactory::CreateDeviceProxy() returns an error
 // code when trying to create a device for an invalid descriptor.
-TEST_F(ServiceTest, DISABLED_ErrorCodeOnCreateDeviceForInvalidDescriptor) {
+TEST_F(VideoCaptureServiceTest,
+       DISABLED_ErrorCodeOnCreateDeviceForInvalidDescriptor) {
   const std::string invalid_device_id = "invalid";
   base::RunLoop wait_loop;
   mojom::DevicePtr fake_device_proxy;