Merge video_capture tests into service_unittests

services/video_capture/test/fake_device_descriptor_unittest.cc

Index: services/video_capture/test/fake_device_descriptor_unittest.cc
diff --git a/services/video_capture/test/fake_device_descriptor_unittest.cc b/services/video_capture/test/fake_device_descriptor_unittest.cc
index e0120fe0c7fb95bf63528c09a80e8fad8f7144fb..401efe8eaee29bebeb496e95b88ae0e702e79a1f 100644
--- a/services/video_capture/test/fake_device_descriptor_unittest.cc
+++ b/services/video_capture/test/fake_device_descriptor_unittest.cc
@@ -16,10 +16,15 @@ class MockCreateDeviceProxyCallback {
   MOCK_METHOD1(Run, void(mojom::DeviceAccessResultCode result_code));
 };
 
+// This alias ensures test output is easily attributed to this service's tests.
+// TODO(rockot/chfremer): Consider just renaming the type.
+using FakeVideoCaptureDeviceDescriptorTest = FakeDeviceDescriptorTest;
+
 // Tests that when requesting a second proxy for a device without closing the
 // first one, the service revokes access to the first one by closing the
 // connection.
-TEST_F(FakeDeviceDescriptorTest, DISABLED_AccessIsRevokedOnSecondAccess) {
+TEST_F(FakeVideoCaptureDeviceDescriptorTest,
+       DISABLED_AccessIsRevokedOnSecondAccess) {
   mojom::DevicePtr device_proxy_1;
   bool device_access_1_revoked = false;
   MockCreateDeviceProxyCallback create_device_proxy_callback_1;
@@ -55,7 +60,8 @@ TEST_F(FakeDeviceDescriptorTest, DISABLED_AccessIsRevokedOnSecondAccess) {
 }
 
 // Tests that a second proxy requested for a device can be used successfully.
-TEST_F(FakeDeviceDescriptorTest, DISABLED_CanUseSecondRequestedProxy) {
+TEST_F(FakeVideoCaptureDeviceDescriptorTest,
+       DISABLED_CanUseSecondRequestedProxy) {
   mojom::DevicePtr device_proxy_1;
   factory_->CreateDevice(
       fake_device_descriptor_.device_id, mojo::MakeRequest(&device_proxy_1),