webkit/media/buffered_data_source_unittest.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: webkit/media/buffered_data_source_unittest.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: rebased & removed unnecessary include of ffmpeg_common.h from ffmpeg_demuxer.h 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: webkit/media/buffered_data_source_unittest.cc

diff --git a/webkit/media/buffered_data_source_unittest.cc b/webkit/media/buffered_data_source_unittest.cc

index 9150fd03a23cc8d3fab661a9f08809b2a6ca5922..a780b4584492feca8345b08288a9d84826b2d9cd 100644

--- a/webkit/media/buffered_data_source_unittest.cc

+++ b/webkit/media/buffered_data_source_unittest.cc

@@ -54,8 +54,12 @@ class MockBufferedDataSource : public BufferedDataSource {

.WillByDefault(Assign(&loading_, true));

ON_CALL(*url_loader, cancel())

.WillByDefault(Assign(&loading_, false));

- loader->SetURLLoaderForTest(url_loader);

+ scoped_ptr<NiceMock<MockWebURLLoader> > mwul(url_loader);

+ // TODO(fischman): hopefully the extra scoped_ptr<WUL> will be

+ // unnecessary once http://codereview.chromium.org/8968032/ lands

+ // properly.

+ scoped_ptr<WebURLLoader> wul(mwul.Pass());

+ loader->SetURLLoaderForTest(wul.Pass());

return loader;

}