| Index: content/browser/renderer_host/media/media_stream_manager.h
|
| diff --git a/content/browser/renderer_host/media/media_stream_manager.h b/content/browser/renderer_host/media/media_stream_manager.h
|
| index edc0cb623632dd4ff77b0451bb635464537dc185..b3a5cecf8d2fd01c9103f59cf24732e0535165b1 100644
|
| --- a/content/browser/renderer_host/media/media_stream_manager.h
|
| +++ b/content/browser/renderer_host/media/media_stream_manager.h
|
| @@ -49,6 +49,7 @@
|
|
|
| namespace media {
|
| class AudioSystem;
|
| +class VideoCaptureSystem;
|
| }
|
|
|
| namespace url {
|
| @@ -87,6 +88,13 @@ class CONTENT_EXPORT MediaStreamManager
|
|
|
| explicit MediaStreamManager(media::AudioSystem* audio_system);
|
|
|
| + // |audio_system| is required but defaults will be used if either
|
| + // |video_capture_system| or |device_task_runner| are null.
|
| + explicit MediaStreamManager(
|
| + media::AudioSystem* audio_system,
|
| + std::unique_ptr<media::VideoCaptureSystem> video_capture_system,
|
| + scoped_refptr<base::SingleThreadTaskRunner> device_task_runner);
|
| +
|
| ~MediaStreamManager() override;
|
|
|
| // Used to access VideoCaptureManager.
|
| @@ -273,9 +281,9 @@ class CONTENT_EXPORT MediaStreamManager
|
| using LabeledDeviceRequest = std::pair<std::string, DeviceRequest*>;
|
| using DeviceRequests = std::list<LabeledDeviceRequest>;
|
|
|
| - // Initializes the device managers on IO thread. Auto-starts the device
|
| - // thread and registers this as a listener with the device managers.
|
| - void InitializeDeviceManagersOnIOThread();
|
| + void InitializeMaybeAsync(
|
| + std::unique_ptr<media::VideoCaptureSystem> video_capture_system,
|
| + scoped_refptr<base::SingleThreadTaskRunner> device_task_runner);
|
|
|
| // |output_parameters| contains real values only if the request requires it.
|
| void HandleAccessRequestResponse(
|
|
|