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 6923c449bed97a787bbbb65c6c1989ccc5c51226..1a7d42920718db53f557556af6e6937caaa928a3 100644 |
--- a/content/browser/renderer_host/media/media_stream_manager.cc |
+++ b/content/browser/renderer_host/media/media_stream_manager.cc |
@@ -165,14 +165,14 @@ VideoCaptureManager* MediaStreamManager::video_capture_manager() { |
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); |
EnsureDeviceManagersStarted(); |
DCHECK(video_capture_manager_); |
- return video_capture_manager_; |
+ return video_capture_manager_.get(); |
} |
AudioInputDeviceManager* MediaStreamManager::audio_input_device_manager() { |
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); |
EnsureDeviceManagersStarted(); |
DCHECK(audio_input_device_manager_); |
- return audio_input_device_manager_; |
+ return audio_input_device_manager_.get(); |
} |
void MediaStreamManager::MakeMediaAccessRequest( |
@@ -559,10 +559,12 @@ void MediaStreamManager::EnsureDeviceManagersStarted() { |
audio_input_device_manager_ = new AudioInputDeviceManager(audio_manager_); |
audio_input_device_manager_->Register(this, |
- device_thread_->message_loop_proxy()); |
+ device_thread_-> |
+ message_loop_proxy().get()); |
video_capture_manager_ = new VideoCaptureManager(); |
- video_capture_manager_->Register(this, device_thread_->message_loop_proxy()); |
+ video_capture_manager_-> |
+ Register(this, device_thread_->message_loop_proxy().get()); |
// We want to be notified of IO message loop destruction to delete the thread |
// and the device managers. |