| 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 3cdb1abffd3cddfffe648d9c74711eb1c7b8f0ae..75343bb33764850f6943f7fdc7dbf2ae80c8a2e2 100644
|
| --- a/content/browser/renderer_host/media/media_stream_manager.cc
|
| +++ b/content/browser/renderer_host/media/media_stream_manager.cc
|
| @@ -39,6 +39,7 @@
|
| #include "media/base/media_switches.h"
|
| #include "media/video/capture/fake_video_capture_device_factory.h"
|
| #include "media/video/capture/file_video_capture_device_factory.h"
|
| +#include "media/video/capture/video_capture_device_factory.h"
|
| #include "url/gurl.h"
|
|
|
| #if defined(OS_WIN)
|
| @@ -1454,9 +1455,10 @@ void MediaStreamManager::InitializeDeviceManagersOnIOThread() {
|
| }
|
| audio_input_device_manager()->UseFakeDevice();
|
| } else {
|
| - video_capture_manager_ = new VideoCaptureManager(
|
| - scoped_ptr<media::VideoCaptureDeviceFactory>(
|
| - new media::VideoCaptureDeviceFactory()));
|
| + scoped_ptr<media::VideoCaptureDeviceFactory> video_capture_device_factory =
|
| + media::VideoCaptureDeviceFactory::Create();
|
| + video_capture_manager_ = new
|
| + VideoCaptureManager(video_capture_device_factory.Pass());
|
| }
|
| video_capture_manager_->Register(this, device_task_runner_);
|
| }
|
|
|