Merge video_capture tests into service_unittests

services/video_capture/test/fake_device_descriptor_unittest.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/run_loop.h"
 #include "services/video_capture/test/fake_device_descriptor_test.h"
 #include "services/video_capture/test/mock_receiver.h"
 
 using testing::_;
 using testing::InvokeWithoutArgs;
 
 namespace video_capture {
 
 class MockCreateDeviceProxyCallback {
  public:
   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;
   EXPECT_CALL(create_device_proxy_callback_1,
               Run(mojom::DeviceAccessResultCode::SUCCESS))
       .Times(1);
   factory_->CreateDevice(
       fake_device_descriptor_.device_id, mojo::MakeRequest(&device_proxy_1),
       base::Bind(&MockCreateDeviceProxyCallback::Run,
                  base::Unretained(&create_device_proxy_callback_1)));
@@ skipping 15 matching lines @@
                  base::Unretained(&create_device_proxy_callback_2)));
   device_proxy_2.set_connection_error_handler(
       base::Bind([](bool* access_revoked) { *access_revoked = true; },
                  &device_access_2_revoked));
   wait_loop.Run();
   ASSERT_TRUE(device_access_1_revoked);
   ASSERT_FALSE(device_access_2_revoked);
 }
 
 // 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),
       base::Bind([](mojom::DeviceAccessResultCode result_code) {}));
 
   base::RunLoop wait_loop;
   mojom::DevicePtr device_proxy_2;
   factory_->CreateDevice(
       fake_device_descriptor_.device_id, mojo::MakeRequest(&device_proxy_2),
       base::Bind(
@@ skipping 16 matching lines @@
   EXPECT_CALL(receiver, OnIncomingCapturedVideoFramePtr(_))
       .WillRepeatedly(
           InvokeWithoutArgs([&wait_loop_2]() { wait_loop_2.Quit(); }));
 
   device_proxy_2->Start(arbitrary_requested_settings,
                         std::move(receiver_proxy));
   wait_loop_2.Run();
 }
 
 }  // namespace video_capture