content/renderer/media/media_stream_source_observer.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/renderer/media/media_stream_source_observer.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/renderer/media/media_stream_source_extra_data.h ('k') | content/renderer/media/mock_media_stream_dependency_factory.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/renderer/media/media_stream_source_observer.cc

diff --git a/content/renderer/media/media_stream_source_observer.cc b/content/renderer/media/media_stream_source_observer.cc

index a62c997525c06d603349fdc5ee5e2ba9add7e8e9..1f165bbfa37c8b83574fee75c6c1f01dd279c9f7 100644

--- a/content/renderer/media/media_stream_source_observer.cc

+++ b/content/renderer/media/media_stream_source_observer.cc

@@ -20,14 +20,14 @@ MediaStreamSourceObserver::MediaStreamSourceObserver(

MediaStreamSourceObserver::~MediaStreamSourceObserver() {

DCHECK(CalledOnValidThread());

- if (webrtc_source_)

+ if (webrtc_source_.get())

webrtc_source_->UnregisterObserver(this);

}

void MediaStreamSourceObserver::OnChanged() {

DCHECK(CalledOnValidThread());

// There should be no more notification after kEnded.

- DCHECK(webrtc_source_ != NULL);

+ DCHECK(webrtc_source_.get() != NULL);

webrtc::MediaSourceInterface::SourceState state = webrtc_source_->state();

if (state == state_)