Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(409)

Unified Diff: content/browser/renderer_host/media/media_stream_manager.cc

Issue 11275088: Remove implicit scoped_refptr operator T* Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 8 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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.

Powered by Google App Engine
This is Rietveld 408576698