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

content/browser/renderer_host/media/video_capture_manager.h

 // Copyright (c) 2012 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.
 
 // VideoCaptureManager is used to open/close, start/stop, enumerate available
 // video capture devices, and manage VideoCaptureController's.
 // All functions are expected to be called from Browser::IO thread. Some helper
 // functions (*OnDeviceThread) will dispatch operations to the device thread.
 // VideoCaptureManager will open OS dependent instances of VideoCaptureDevice.
 // A device can only be opened once.
@@ skipping 15 matching lines @@
 #include "base/threading/thread_checker.h"
 #include "base/timer/elapsed_timer.h"
 #include "build/build_config.h"
 #include "content/browser/renderer_host/media/buildable_video_capture_device.h"
 #include "content/browser/renderer_host/media/media_stream_provider.h"
 #include "content/browser/renderer_host/media/video_capture_controller_event_handler.h"
 #include "content/common/content_export.h"
 #include "content/common/media/media_stream_options.h"
 #include "media/base/video_facing.h"
 #include "media/capture/video/video_capture_device.h"
-#include "media/capture/video/video_capture_device_factory.h"
 #include "media/capture/video/video_capture_device_info.h"
 #include "media/capture/video/video_capture_system.h"
 #include "media/capture/video_capture_types.h"
 
 #if defined(OS_ANDROID)
 #include "base/android/application_status_listener.h"
 #endif
 
 namespace content {
 class VideoCaptureController;
@@ skipping 109 matching lines @@
   // in use.
   bool GetDeviceFormatsInUse(MediaStreamType stream_type,
                              const std::string& device_id,
                              media::VideoCaptureFormats* supported_formats);
 
   // Sets the platform-dependent window ID for the desktop capture notification
   // UI for the given session.
   void SetDesktopCaptureWindowId(media::VideoCaptureSessionId session_id,
                                  gfx::NativeViewId window_id);
 
-  // Gets a weak reference to the device factory, used for tests.
-  media::VideoCaptureDeviceFactory* video_capture_device_factory() const {
-    return video_capture_system_->video_capture_device_factory();
-  }
-
-#if defined(OS_WIN)
-  void set_device_task_runner(
-      const scoped_refptr<base::SingleThreadTaskRunner>& device_task_runner) {
-    device_task_runner_ = device_task_runner;
-  }
-#endif
-
-  // Returns the SingleThreadTaskRunner where devices are enumerated on and
-  // started.
-  scoped_refptr<base::SingleThreadTaskRunner>& device_task_runner() {
-    return device_task_runner_;
-  }
-
   void GetPhotoCapabilities(
       int session_id,
       VideoCaptureDevice::GetPhotoCapabilitiesCallback callback);
   void SetPhotoOptions(int session_id,
                        media::mojom::PhotoSettingsPtr settings,
                        VideoCaptureDevice::SetPhotoOptionsCallback callback);
   void TakePhoto(int session_id,
                  VideoCaptureDevice::TakePhotoCallback callback);
 
 #if defined(OS_ANDROID)
@@ skipping 131 matching lines @@
   // Map used by DesktopCapture.
   std::map<media::VideoCaptureSessionId, gfx::NativeViewId>
       notification_window_ids_;
 
   DISALLOW_COPY_AND_ASSIGN(VideoCaptureManager);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_RENDERER_HOST_MEDIA_VIDEO_CAPTURE_MANAGER_H_