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

webkit/media/buffered_data_source_unittest.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 "base/bind.h"
 #include "media/base/media_log.h"
 #include "media/base/mock_callback.h"
 #include "media/base/mock_data_source_host.h"
 #include "media/base/mock_filters.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
@@ skipping 36 matching lines @@
     BufferedResourceLoader* loader =
         BufferedDataSource::CreateResourceLoader(first_byte_position,
                                                  last_byte_position);
 
     // Keep track of active loading state via loadAsynchronously() and cancel().
     NiceMock<MockWebURLLoader>* url_loader = new NiceMock<MockWebURLLoader>();
     ON_CALL(*url_loader, loadAsynchronously(_, _))
         .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;
   }
 
   bool loading() { return loading_; }
   void set_loading(bool loading) { loading_ = loading; }
 
  private:
   // Whether the resource load has starting loading but yet to been cancelled.
   bool loading_;
 
@@ skipping 379 matching lines @@
 
   // During teardown we'll also report our final network status.
   EXPECT_CALL(host_, SetBufferedBytes(kDataSize));
   //EXPECT_CALL(host_, SetNetworkActivity(false));
 
   EXPECT_TRUE(data_source_->loading());
   Stop();
 }
 
 }  // namespace webkit_media