Take advantage of the new Pass() machinery on scoped_ptr{,_malloc}.

webkit/media/buffered_resource_loader.cc

Index: webkit/media/buffered_resource_loader.cc
diff --git a/webkit/media/buffered_resource_loader.cc b/webkit/media/buffered_resource_loader.cc
index b1a40033f2ba95318ce7a7a8fedf5d139d867a5f..ace4e80bd5b644baacea6e5fa07ab452c8141202 100644
--- a/webkit/media/buffered_resource_loader.cc
+++ b/webkit/media/buffered_resource_loader.cc
@@ -182,7 +182,7 @@ void BufferedResourceLoader::Start(
 
   // Start the resource loading.
   loader->loadAsynchronously(request, this);
-  active_loader_.reset(new ActiveLoader(loader));
+  active_loader_.reset(new ActiveLoader(scoped_ptr<WebURLLoader>(loader)));

[acolwell GONE FROM CHROMIUM, 2012/01/03 19:27:06]

Perhaps make loader scoped_ptr since we've got ownership transfer happening
above?

[Ami GONE FROM CHROMIUM, 2012/01/03 20:58:34]

Done.

 }
 
 void BufferedResourceLoader::Stop() {
@@ -317,8 +317,9 @@ const GURL& BufferedResourceLoader::url() {
   return url_;
 }
 
-void BufferedResourceLoader::SetURLLoaderForTest(WebURLLoader* test_loader) {
-  test_loader_.reset(test_loader);
+void BufferedResourceLoader::SetURLLoaderForTest(
+    scoped_ptr<WebURLLoader> test_loader) {
+  test_loader_ = test_loader.Pass();
 }
 
 /////////////////////////////////////////////////////////////////////////////