content/browser/renderer_host/media/media_stream_manager.cc - Issue 16294003: Update content/ to use scoped_refptr<T>::get() rather than implicit "operator T*"

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 16294003: Update content/ 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, 7 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/media_stream_dispatcher_host_unittest.cc ('k') | content/browser/renderer_host/media/video_capture_buffer_pool.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 1d632623fdee51e985724d0c91a45f72bb8f3662..84c2dc106e0934883262f5ea8ed16233ca41be29 100644

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

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

@@ -176,14 +176,14 @@ MediaStreamManager::~MediaStreamManager() {

VideoCaptureManager* MediaStreamManager::video_capture_manager() {

DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));

- DCHECK(video_capture_manager_);

- return video_capture_manager_;

+ DCHECK(video_capture_manager_.get());

+ return video_capture_manager_.get();

}

AudioInputDeviceManager* MediaStreamManager::audio_input_device_manager() {

DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));

- DCHECK(audio_input_device_manager_);

- return audio_input_device_manager_;

+ DCHECK(audio_input_device_manager_.get());

+ return audio_input_device_manager_.get();

}

std::string MediaStreamManager::MakeMediaAccessRequest(