media/base/filter_collection.cc - Issue 9015015: Take advantage of the new Pass() machinery on scoped_ptr{,_malloc}.

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: media/base/filter_collection.cc

Issue 9015015: Take advantage of the new Pass() machinery on scoped_ptr{,_malloc}. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: acolwell CR#2 responses. Created 8 years, 12 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:

Index: media/base/filter_collection.cc

diff --git a/media/base/filter_collection.cc b/media/base/filter_collection.cc

index ed2339f3f9cdea625e84c1fe87e8381a6d234e88..172369c619db8ea7c25c600ca11362781c830118 100644

--- a/media/base/filter_collection.cc

+++ b/media/base/filter_collection.cc

@@ -12,9 +12,9 @@ FilterCollection::FilterCollection() {}

FilterCollection::~FilterCollection() {}

-void FilterCollection::SetDemuxerFactory(DemuxerFactory* factory) {

- DCHECK(factory);

- demuxer_factory_.reset(factory);

+void FilterCollection::SetDemuxerFactory(scoped_ptr<DemuxerFactory> factory) {

+ DCHECK(factory.get());

+ demuxer_factory_ = factory.Pass();

}

DemuxerFactory* FilterCollection::GetDemuxerFactory() {