[Mojo Video Capture] Use actual factory instances implementing media::VideoCaptureDeviceFactory

services/video_capture/video_capture_service.h

 // 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_VIDEO_CAPTURE_SERVICE_H_
 #define SERVICES_VIDEO_CAPTURE_VIDEO_CAPTURE_SERVICE_H_
 
 #include <memory>
 
 #include "mojo/public/cpp/bindings/binding_set.h"
 #include "services/service_manager/public/cpp/service.h"
 #include "services/video_capture/public/interfaces/video_capture_service.mojom.h"
 
 namespace video_capture {
 
-class VideoCaptureDeviceFactoryImpl;
+class DeviceFactoryMediaToMojoAdapter;
+class MockDeviceFactory;
 
 // Implementation of mojom::VideoCaptureService as a Service Manager service.
 class VideoCaptureService
     : public service_manager::Service,
       public service_manager::InterfaceFactory<mojom::VideoCaptureService>,
       public mojom::VideoCaptureService {
  public:
   VideoCaptureService();
   ~VideoCaptureService() override;
 
@@ skipping 13 matching lines @@
   void ConnectToMockDeviceFactory(
       mojom::VideoCaptureDeviceFactoryRequest request) override;
   void AddDeviceToMockFactory(
       mojom::MockVideoCaptureDevicePtr device,
       const media::VideoCaptureDeviceDescriptor& descriptor,
       const AddDeviceToMockFactoryCallback& callback) override;
 
  private:
   void LazyInitializeDeviceFactory();
   void LazyInitializeFakeDeviceFactory();
   void LazyInitializeMockDeviceFactory();

[mcasas, 2016/11/04 23:24:29]

Unrelated nit: shouldn't we add a ForTesting suffix to 
the Mock method ? (I understand that the Fake can
be used in Release builds, but the mock is only used
for tests, correct?)

[chfremer, 2016/11/07 18:42:37]

You are correct. The mock factory is indeed testing-only.
Please allow me to keep things as is for now, since I already have a CL ready in
my local branch where I separate testing from production stuff. Better than just
indicating test-only stuff using a suffix, this CL separates things such that
testing-only stuff does not even appear in the production code or binaries.

 
   mojo::BindingSet<mojom::VideoCaptureService> service_bindings_;
   mojo::BindingSet<mojom::VideoCaptureDeviceFactory> factory_bindings_;
   mojo::BindingSet<mojom::VideoCaptureDeviceFactory> fake_factory_bindings_;
   mojo::BindingSet<mojom::VideoCaptureDeviceFactory> mock_factory_bindings_;
-  std::unique_ptr<VideoCaptureDeviceFactoryImpl> device_factory_;
-  std::unique_ptr<VideoCaptureDeviceFactoryImpl> fake_device_factory_;
-  std::unique_ptr<VideoCaptureDeviceFactoryImpl> mock_device_factory_;
+  std::unique_ptr<DeviceFactoryMediaToMojoAdapter> device_factory_;
+  std::unique_ptr<DeviceFactoryMediaToMojoAdapter> fake_device_factory_;
+  std::unique_ptr<DeviceFactoryMediaToMojoAdapter> mock_device_factory_adapter_;
+  MockDeviceFactory* mock_device_factory_;
 };
 
 }  // namespace video_capture
 
 #endif  // SERVICES_VIDEO_CAPTURE_VIDEO_CAPTURE_SERVICE_H_