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 7a3e724d40d580d8ae3dc1600376e358a807888b..6400301b8601f543770a9a1144d93c9f34507d5c 100644 |
--- a/content/browser/renderer_host/media/media_stream_manager.cc |
+++ b/content/browser/renderer_host/media/media_stream_manager.cc |
@@ -403,8 +403,10 @@ void MediaStreamManager::SendMessageToNativeLog(const std::string& message) { |
msm->AddLogMessageOnIOThread(message); |
} |
-MediaStreamManager::MediaStreamManager(media::AudioManager* audio_manager) |
+MediaStreamManager::MediaStreamManager(media::AudioManager* audio_manager, |
+ component::VideoCaptureObserver* capture_observer) |
: audio_manager_(audio_manager), |
+ capture_observer_(capture_observer), |
#if defined(OS_WIN) |
video_capture_thread_("VideoCaptureThread"), |
#endif |
@@ -1257,7 +1259,8 @@ void MediaStreamManager::InitializeDeviceManagersOnIOThread() { |
"457525 MediaStreamManager::InitializeDeviceManagersOnIOThread 4")); |
video_capture_manager_ = |
new VideoCaptureManager(media::VideoCaptureDeviceFactory::CreateFactory( |
- BrowserThread::GetTaskRunnerForThread(BrowserThread::UI))); |
+ BrowserThread::GetTaskRunnerForThread(BrowserThread::UI)), |
+ capture_observer_); |
#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. |