[Mojo Video Capture] Simplify API and some cleanups

services/video_capture/mock_device_video_capture_service_test.h

Index: services/video_capture/mock_device_video_capture_service_test.h
diff --git a/services/video_capture/mock_device_video_capture_service_test.h b/services/video_capture/mock_device_video_capture_service_test.h
deleted file mode 100644
index 592c9f7a9d637bcc4d1c28ccd9a2688967eb0d16..0000000000000000000000000000000000000000
--- a/services/video_capture/mock_device_video_capture_service_test.h
+++ /dev/null
@@ -1,40 +0,0 @@
-// 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.
-
-#ifndef SERVICES_VIDEO_CAPTURE_MOCK_DEVICE_VIDEO_CAPTURE_SERVICE_TEST_H_
-#define SERVICES_VIDEO_CAPTURE_MOCK_DEVICE_VIDEO_CAPTURE_SERVICE_TEST_H_
-
-#include "services/service_manager/public/cpp/service_test.h"
-#include "services/video_capture/mock_device_descriptor_receiver.h"
-#include "services/video_capture/mock_video_capture_device_impl.h"
-#include "services/video_capture/mock_video_frame_receiver.h"
-#include "services/video_capture/public/interfaces/video_capture_service.mojom.h"
-
-namespace video_capture {
-
-// Reusable test setup for testing with a single mock device.
-class MockDeviceVideoCaptureServiceTest
-    : public service_manager::test::ServiceTest {
- public:
-  MockDeviceVideoCaptureServiceTest();
-  ~MockDeviceVideoCaptureServiceTest() override;
-
-  void SetUp() override;
-
- protected:
-  mojom::VideoCaptureServicePtr service_;
-  mojom::VideoCaptureDeviceFactoryPtr factory_;
-  MockDeviceDescriptorReceiver descriptor_receiver_;
-
-  std::unique_ptr<MockVideoCaptureDeviceImpl> mock_device_;
-  std::unique_ptr<MockVideoFrameReceiver> mock_receiver_;
-  mojom::MockVideoCaptureDevicePtr mock_device_proxy_;
-  mojom::VideoCaptureDeviceProxyPtr device_proxy_;
-  mojom::VideoFrameReceiverPtr mock_receiver_proxy_;
-  media::VideoCaptureFormat requested_format_;
-};
-
-}  // namespace video_capture
-
-#endif  // SERVICES_VIDEO_CAPTURE_MOCK_DEVICE_VIDEO_CAPTURE_SERVICE_TEST_H_