| Index: content/browser/renderer_host/media/media_stream_manager.cc
|
| diff --git a/content/browser/renderer_host/media/media_stream_manager.cc b/content/browser/renderer_host/media/media_stream_manager.cc
|
| index 73c6345d35e9f531130e75fb38f9f2b58e0d34e4..faad748b60eef79fb5bf6a2a68b4cb4d05854895 100644
|
| --- a/content/browser/renderer_host/media/media_stream_manager.cc
|
| +++ b/content/browser/renderer_host/media/media_stream_manager.cc
|
| @@ -49,7 +49,7 @@
|
| #include "media/base/audio_parameters.h"
|
| #include "media/base/channel_layout.h"
|
| #include "media/base/media_switches.h"
|
| -#include "media/capture/video/video_capture_device_factory.h"
|
| +#include "media/capture/video/video_capture_system.h"
|
| #include "url/gurl.h"
|
| #include "url/origin.h"
|
|
|
| @@ -1258,20 +1258,19 @@ void MediaStreamManager::InitializeDeviceManagersOnIOThread() {
|
| tracked_objects::ScopedTracker tracking_profile4(
|
| FROM_HERE_WITH_EXPLICIT_FUNCTION(
|
| "457525 MediaStreamManager::InitializeDeviceManagersOnIOThread 4"));
|
| + auto video_capture_system = base::MakeUnique<media::VideoCaptureSystem>(
|
| + media::VideoCaptureDeviceFactory::CreateFactory(
|
| + BrowserThread::GetTaskRunnerForThread(BrowserThread::UI)));
|
| #if defined(OS_WIN)
|
| // Use an STA Video Capture Thread to try to avoid crashes on enumeration of
|
| // buggy third party Direct Show modules, http://crbug.com/428958.
|
| video_capture_thread_.init_com_with_mta(false);
|
| CHECK(video_capture_thread_.Start());
|
| video_capture_manager_ = new VideoCaptureManager(
|
| - media::VideoCaptureDeviceFactory::CreateFactory(
|
| - BrowserThread::GetTaskRunnerForThread(BrowserThread::UI)),
|
| - video_capture_thread_.task_runner());
|
| + std::move(video_capture_system), video_capture_thread_.task_runner());
|
| #else
|
| video_capture_manager_ = new VideoCaptureManager(
|
| - media::VideoCaptureDeviceFactory::CreateFactory(
|
| - BrowserThread::GetTaskRunnerForThread(BrowserThread::UI)),
|
| - device_task_runner_);
|
| + std::move(video_capture_system), device_task_runner_);
|
| #endif
|
|
|
| video_capture_manager_->RegisterListener(this);
|
|
|