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

webkit/media/buffered_resource_loader.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "webkit/media/buffered_resource_loader.h"
 
 #include "base/format_macros.h"
 #include "base/stringprintf.h"
 #include "base/string_util.h"
 #include "media/base/media_log.h"
@@ skipping 151 matching lines @@
                                             last_byte_position_)));
   }
   frame->setReferrerForRequest(request, WebKit::WebURL());
 
   // Disable compression, compression for audio/video doesn't make sense...
   request.setHTTPHeaderField(
       WebString::fromUTF8(net::HttpRequestHeaders::kAcceptEncoding),
       WebString::fromUTF8("identity;q=1, *;q=0"));
 
   // Check for our test WebURLLoader.
-  WebURLLoader* loader = NULL;
+  scoped_ptr<WebURLLoader> loader;
   if (test_loader_.get()) {
-    loader = test_loader_.release();
+    loader = test_loader_.Pass();
   } else {
     WebURLLoaderOptions options;
     options.allowCredentials = true;
     options.crossOriginRequestPolicy =
         WebURLLoaderOptions::CrossOriginRequestPolicyAllow;
-    loader = frame->createAssociatedURLLoader(options);
+    loader.reset(frame->createAssociatedURLLoader(options));
   }
 
   // Start the resource loading.
   loader->loadAsynchronously(request, this);
-  active_loader_.reset(new ActiveLoader(loader));
+  active_loader_.reset(new ActiveLoader(loader.Pass()));
 }
 
 void BufferedResourceLoader::Stop() {
   // Reset callbacks.
   start_callback_.Reset();
   event_callback_.Reset();
   read_callback_.Reset();
 
   // Use the internal buffer to signal that we have been stopped.
   // TODO(hclam): Not so pretty to do this.
@@ skipping 114 matching lines @@
 }
 
 bool BufferedResourceLoader::is_downloading_data() {
   return active_loader_.get() && !active_loader_->deferred();
 }
 
 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();
 }
 
 /////////////////////////////////////////////////////////////////////////////
 // WebKit::WebURLLoaderClient implementation.
 void BufferedResourceLoader::willSendRequest(
     WebURLLoader* loader,
     WebURLRequest& newRequest,
     const WebURLResponse& redirectResponse) {
 
   // The load may have been stopped and |start_callback| is destroyed.
@@ skipping 443 matching lines @@
   if (buffer_.get()) {
     media_log_->AddEvent(
         media_log_->CreateBufferedExtentsChangedEvent(
             offset_ - buffer_->backward_bytes(),
             offset_,
             offset_ + buffer_->forward_bytes()));
   }
 }
 
 }  // namespace webkit_media