Video Capture Mojo (1.4c): Handle Subsequent Access

services/video_capture/fake_device_video_capture_service_test.cc

Index: services/video_capture/fake_device_video_capture_service_test.cc
diff --git a/services/video_capture/fake_device_video_capture_service_test.cc b/services/video_capture/fake_device_video_capture_service_test.cc
index b24ba1d809fa16c0f916c696b1a63ed3bae2507c..c5857bc9c90a719ca9b8e0908763331615c07b42 100644
--- a/services/video_capture/fake_device_video_capture_service_test.cc
+++ b/services/video_capture/fake_device_video_capture_service_test.cc
@@ -12,30 +12,16 @@ using testing::Invoke;
 namespace video_capture {
 
 FakeDeviceVideoCaptureServiceTest::FakeDeviceVideoCaptureServiceTest()
-    : VideoCaptureServiceTest() {}
+    : FakeDeviceDescriptorVideoCaptureServiceTest() {}
 
 FakeDeviceVideoCaptureServiceTest::~FakeDeviceVideoCaptureServiceTest() =
     default;
 
 void FakeDeviceVideoCaptureServiceTest::SetUp() {
-  VideoCaptureServiceTest::SetUp();
-
-  base::RunLoop wait_loop;
-  mojom::VideoCaptureDeviceDescriptorPtr fake_device_descriptor;
-  EXPECT_CALL(descriptor_receiver_, OnEnumerateDeviceDescriptorsCallback(_))
-      .WillOnce(Invoke([&wait_loop, &fake_device_descriptor](
-          const std::vector<mojom::VideoCaptureDeviceDescriptorPtr>&
-              descriptors) {
-        fake_device_descriptor = descriptors[0].Clone();
-        wait_loop.Quit();
-      }));
-  factory_->EnumerateDeviceDescriptors(base::Bind(
-      &MockDeviceDescriptorReceiver::HandleEnumerateDeviceDescriptorsCallback,
-      base::Unretained(&descriptor_receiver_)));
-  wait_loop.Run();
+  FakeDeviceDescriptorVideoCaptureServiceTest::SetUp();
 
   factory_->CreateDeviceProxy(
-      std::move(fake_device_descriptor), mojo::GetProxy(&fake_device_proxy_),
+      std::move(fake_device_descriptor_), mojo::GetProxy(&fake_device_proxy_),
       base::Bind([](mojom::DeviceAccessResultCode result_code) {
         ASSERT_EQ(mojom::DeviceAccessResultCode::SUCCESS, result_code);
       }));