[Mojo Video Capture] Fix VideoCaptureManager exposing implementation details to clients

media/capture/video/video_capture_system.h

 // Copyright 2017 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 MEDIA_CAPTURE_VIDEO_VIDEO_CAPTURE_SYSTEM_H_
 #define MEDIA_CAPTURE_VIDEO_VIDEO_CAPTURE_SYSTEM_H_
 
 #include "media/capture/video/video_capture_device_factory.h"
 #include "media/capture/video/video_capture_device_info.h"
 
 namespace media {
 
-// Layer on top of VideoCaptureDeviceFactory that translates device descriptors
-// to string identifiers and consolidates and caches device descriptors and
-// supported formats into VideoCaptureDeviceInfos.
 class CAPTURE_EXPORT VideoCaptureSystem {
  public:
   using DeviceInfoCallback =
       base::Callback<void(const std::vector<VideoCaptureDeviceInfo>&)>;
 
-  explicit VideoCaptureSystem(
-      std::unique_ptr<VideoCaptureDeviceFactory> factory);
-  ~VideoCaptureSystem();
-
-  void GetDeviceInfosAsync(const DeviceInfoCallback& result_callback);
+  virtual ~VideoCaptureSystem() {}
+  virtual void GetDeviceInfosAsync(
+      const DeviceInfoCallback& result_callback) = 0;
 
   // Creates a VideoCaptureDevice object. Returns nullptr if something goes
   // wrong.
+  virtual std::unique_ptr<VideoCaptureDevice> CreateDevice(
+      const std::string& device_id) = 0;
+};
+
+// Layer on top of VideoCaptureDeviceFactory that translates device descriptors
+// to string identifiers and consolidates and caches device descriptors and
+// supported formats into VideoCaptureDeviceInfos.
+class CAPTURE_EXPORT VideoCaptureSystemImpl : public VideoCaptureSystem {

[miu, 2017/04/03 21:31:24]

Should this be in a separate video_capture_system_impl.h file?

[chfremer, 2017/04/04 21:59:32]

Done.

+ public:
+  explicit VideoCaptureSystemImpl(
+      std::unique_ptr<VideoCaptureDeviceFactory> factory);
+  ~VideoCaptureSystemImpl() override;
+
+  void GetDeviceInfosAsync(const DeviceInfoCallback& result_callback) override;
   std::unique_ptr<VideoCaptureDevice> CreateDevice(
-      const std::string& device_id);
-
-  media::VideoCaptureDeviceFactory* video_capture_device_factory() const {
-    return factory_.get();
-  }
+      const std::string& device_id) override;
 
  private:
   void OnDescriptorsReceived(
       const DeviceInfoCallback& result_callback,
       std::unique_ptr<VideoCaptureDeviceDescriptors> descriptors);
 
   // Returns nullptr if no descriptor found.
   const VideoCaptureDeviceInfo* LookupDeviceInfoFromId(
       const std::string& device_id);
 
   const std::unique_ptr<VideoCaptureDeviceFactory> factory_;
   std::vector<VideoCaptureDeviceInfo> devices_info_cache_;
 };
 
 }  // namespace media
 
 #endif  // MEDIA_CAPTURE_VIDEO_VIDEO_CAPTURE_DEVICE_FACTORY_H_