content/browser/renderer_host/media/media_stream_manager.cc - Issue 501033003: Remove implicit conversions from scoped_refptr to T* in content/browser/renderer_host/

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 501033003: Remove implicit conversions from scoped_refptr to T* in content/browser/renderer_host/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 years, 4 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

« no previous file with comments | « content/browser/renderer_host/media/audio_input_device_manager.cc ('k') | content/browser/renderer_host/media/video_capture_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 cdb71b1a6a56aad9cece3a7fd7ed80d97a25672a..1678d2b1148a06b6d34cf5e6e64229445517327a 100644

--- a/content/browser/renderer_host/media/media_stream_manager.cc

+++ b/content/browser/renderer_host/media/media_stream_manager.cc

@@ -396,7 +396,7 @@ MediaStreamManager::MediaStreamManager(media::AudioManager* audio_manager)

MediaStreamManager::~MediaStreamManager() {

DVLOG(1) << "~MediaStreamManager";

DCHECK(requests_.empty());

- DCHECK(!device_task_runner_);

+ DCHECK(!device_task_runner_.get());

base::PowerMonitor* power_monitor = base::PowerMonitor::Get();

// The PowerMonitor instance owned by BrowserMainLoops always outlives the

@@ -1529,7 +1529,7 @@ void MediaStreamManager::FinalizeMediaAccessRequest(

void MediaStreamManager::InitializeDeviceManagersOnIOThread() {

DCHECK_CURRENTLY_ON(BrowserThread::IO);

- if (device_task_runner_)

+ if (device_task_runner_.get())

return;

device_task_runner_ = audio_manager_->GetWorkerTaskRunner();

@@ -1926,7 +1926,7 @@ void MediaStreamManager::WillDestroyCurrentMessageLoop() {

DVLOG(3) << "MediaStreamManager::WillDestroyCurrentMessageLoop()";

DCHECK_EQ(base::MessageLoop::current(), io_loop_);

DCHECK(requests_.empty());

- if (device_task_runner_) {

+ if (device_task_runner_.get()) {

StopMonitoring();

video_capture_manager_->Unregister();