[Mojo Video Capture] Cleanup naming of classes/files in services/video_capture

services/video_capture/fake_device_descriptor_unittest.cc

Index: services/video_capture/fake_device_descriptor_unittest.cc
diff --git a/services/video_capture/fake_device_descriptor_unittest.cc b/services/video_capture/fake_device_descriptor_unittest.cc
index 08af99f5e1d25520f8915d21adb2dcb637769a5c..8d2589335c792057573b54fd77e26c6bab10c536 100644
--- a/services/video_capture/fake_device_descriptor_unittest.cc
+++ b/services/video_capture/fake_device_descriptor_unittest.cc
@@ -4,7 +4,7 @@
 
 #include "base/run_loop.h"
 #include "services/video_capture/fake_device_descriptor_test.h"
-#include "services/video_capture/mock_video_frame_receiver.h"
+#include "services/video_capture/mock_receiver.h"
 
 using testing::_;
 using testing::InvokeWithoutArgs;
@@ -20,13 +20,13 @@ class MockCreateDeviceProxyCallback {
 // first one, the service revokes access to the first one by closing the
 // connection.
 TEST_F(FakeDeviceDescriptorTest, AccessIsRevokedOnSecondAccess) {
-  mojom::VideoCaptureDeviceProxyPtr device_proxy_1;
+  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_->CreateDeviceProxy(
+  factory_->CreateDevice(
       fake_device_descriptor_.device_id, mojo::GetProxy(&device_proxy_1),
       base::Bind(&MockCreateDeviceProxyCallback::Run,
                  base::Unretained(&create_device_proxy_callback_1)));
@@ -35,14 +35,14 @@ TEST_F(FakeDeviceDescriptorTest, AccessIsRevokedOnSecondAccess) {
                  &device_access_1_revoked));
 
   base::RunLoop wait_loop;
-  mojom::VideoCaptureDeviceProxyPtr device_proxy_2;
+  mojom::DevicePtr device_proxy_2;
   bool device_access_2_revoked = false;
   MockCreateDeviceProxyCallback create_device_proxy_callback_2;
   EXPECT_CALL(create_device_proxy_callback_2,
               Run(mojom::DeviceAccessResultCode::SUCCESS))
       .Times(1)
       .WillOnce(InvokeWithoutArgs([&wait_loop]() { wait_loop.Quit(); }));
-  factory_->CreateDeviceProxy(
+  factory_->CreateDevice(
       fake_device_descriptor_.device_id, mojo::GetProxy(&device_proxy_2),
       base::Bind(&MockCreateDeviceProxyCallback::Run,
                  base::Unretained(&create_device_proxy_callback_2)));
@@ -56,14 +56,14 @@ TEST_F(FakeDeviceDescriptorTest, AccessIsRevokedOnSecondAccess) {
 
 // Tests that a second proxy requested for a device can be used successfully.
 TEST_F(FakeDeviceDescriptorTest, CanUseSecondRequestedProxy) {
-  mojom::VideoCaptureDeviceProxyPtr device_proxy_1;
-  factory_->CreateDeviceProxy(
+  mojom::DevicePtr device_proxy_1;
+  factory_->CreateDevice(
       fake_device_descriptor_.device_id, mojo::GetProxy(&device_proxy_1),
       base::Bind([](mojom::DeviceAccessResultCode result_code) {}));
 
   base::RunLoop wait_loop;
-  mojom::VideoCaptureDeviceProxyPtr device_proxy_2;
-  factory_->CreateDeviceProxy(
+  mojom::DevicePtr device_proxy_2;
+  factory_->CreateDevice(
       fake_device_descriptor_.device_id, mojo::GetProxy(&device_proxy_2),
       base::Bind(
           [](base::RunLoop* wait_loop,
@@ -71,7 +71,7 @@ TEST_F(FakeDeviceDescriptorTest, CanUseSecondRequestedProxy) {
           &wait_loop));
   wait_loop.Run();
 
-  VideoCaptureSettings arbitrary_requested_settings;
+  CaptureSettings arbitrary_requested_settings;
   arbitrary_requested_settings.format.frame_size.SetSize(640, 480);
   arbitrary_requested_settings.format.frame_rate = 15;
   arbitrary_requested_settings.resolution_change_policy =
@@ -80,8 +80,8 @@ TEST_F(FakeDeviceDescriptorTest, CanUseSecondRequestedProxy) {
       media::PowerLineFrequency::FREQUENCY_DEFAULT;
 
   base::RunLoop wait_loop_2;
-  mojom::VideoFrameReceiverPtr receiver_proxy;
-  MockVideoFrameReceiver receiver(mojo::GetProxy(&receiver_proxy));
+  mojom::ReceiverPtr receiver_proxy;
+  MockReceiver receiver(mojo::GetProxy(&receiver_proxy));
   EXPECT_CALL(receiver, OnIncomingCapturedVideoFramePtr(_))
       .WillRepeatedly(
           InvokeWithoutArgs([&wait_loop_2]() { wait_loop_2.Quit(); }));