Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(331)

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: . Created 8 years, 11 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 | « webkit/media/active_loader.cc ('k') | webkit/media/buffered_resource_loader.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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..be0c9ed478d0ba5fb96e6f4dbeb04dd4277ce5d1 100644
--- a/webkit/media/buffered_data_source_unittest.cc
+++ b/webkit/media/buffered_data_source_unittest.cc
@@ -54,8 +54,11 @@ 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): replace the extra scoped_ptr+release() with Pass() when
+ // http://crbug.com/109026 is fixed.
+ scoped_ptr<WebURLLoader> wul(mwul.release());
+ loader->SetURLLoaderForTest(wul.Pass());
return loader;
}
« no previous file with comments | « webkit/media/active_loader.cc ('k') | webkit/media/buffered_resource_loader.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698