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

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

Issue 17948002: Update Linux to use scoped_refptr<T>::get() rather than implicit "operator T*" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased Created 7 years, 6 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 62a3517a2b03bc65365a89651857beb7bddb5d3e..5752d88b2f96ac71052f35c920b3ec5433d57e37 100644
--- a/content/browser/renderer_host/media/media_stream_manager.cc
+++ b/content/browser/renderer_host/media/media_stream_manager.cc
@@ -148,7 +148,7 @@ MediaStreamManager::MediaStreamManager(media::AudioManager* audio_manager)
MediaStreamManager::~MediaStreamManager() {
DCHECK(requests_.empty());
- DCHECK(!device_loop_);
+ DCHECK(!device_loop_.get());
DCHECK(!io_loop_);
}
@@ -585,15 +585,15 @@ void MediaStreamManager::HandleRequest(const std::string& label) {
void MediaStreamManager::InitializeDeviceManagersOnIOThread() {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
- if (device_loop_)
+ if (device_loop_.get())
return;
device_loop_ = audio_manager_->GetMessageLoop();
audio_input_device_manager_ = new AudioInputDeviceManager(audio_manager_);
- audio_input_device_manager_->Register(this, device_loop_);
+ audio_input_device_manager_->Register(this, device_loop_.get());
video_capture_manager_ = new VideoCaptureManager();
- video_capture_manager_->Register(this, device_loop_);
+ video_capture_manager_->Register(this, device_loop_.get());
// We want to be notified of IO message loop destruction to delete the thread
// and the device managers.
@@ -937,7 +937,7 @@ void MediaStreamManager::UseFakeUI(scoped_ptr<FakeMediaStreamUIProxy> fake_ui) {
void MediaStreamManager::WillDestroyCurrentMessageLoop() {
DCHECK_EQ(base::MessageLoop::current(), io_loop_);
DCHECK(requests_.empty());
- if (device_loop_) {
+ if (device_loop_.get()) {
StopMonitoring();
video_capture_manager_->Unregister();
« no previous file with comments | « content/browser/indexed_db/indexed_db_unittest.cc ('k') | content/browser/renderer_host/p2p/socket_dispatcher_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698