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

media/base/composite_data_source_factory.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 "media/base/composite_data_source_factory.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/stl_util.h"
@@ skipping 17 matching lines @@
 
   FactoryList factories_;
 };
 
 CompositeDataSourceFactory::CompositeDataSourceFactory() {}
 
 CompositeDataSourceFactory::~CompositeDataSourceFactory() {
   STLDeleteElements(&factories_);
 }
 
-void CompositeDataSourceFactory::AddFactory(DataSourceFactory* factory) {
-  DCHECK(factory);
-  factories_.push_back(factory);
+void CompositeDataSourceFactory::AddFactory(
+    scoped_ptr<DataSourceFactory> factory) {
+  DCHECK(factory.get());
+  factories_.push_back(factory.release());
 }
 
-DataSourceFactory* CompositeDataSourceFactory::Clone() const {
-  CompositeDataSourceFactory* new_factory = new CompositeDataSourceFactory();
+scoped_ptr<DataSourceFactory> CompositeDataSourceFactory::Clone() const {
+  scoped_ptr<CompositeDataSourceFactory> new_factory(
+      new CompositeDataSourceFactory());
 
   for (FactoryList::const_iterator itr = factories_.begin();
        itr != factories_.end();
        ++itr) {
     new_factory->AddFactory((*itr)->Clone());
   }
 
-  return new_factory;
+  // TODO(fischman): hopefully the extra scoped_ptr<m::DSF>() will be
+  // unnecessary once http://codereview.chromium.org/8968032/ lands
+  // properly.
+  return scoped_ptr<DataSourceFactory>(new_factory.Pass());
 }
 
 bool CompositeDataSourceFactory::AllowRequests() const {
   return !factories_.empty();
 }
 
 AsyncDataSourceFactoryBase::BuildRequest*
 CompositeDataSourceFactory::CreateRequest(const std::string& url,
                                           const BuildCallback& callback) {
   return new BuildRequest(url, callback, factories_);
@@ skipping 10 matching lines @@
 
 CompositeDataSourceFactory::BuildRequest::~BuildRequest() {}
 
 void CompositeDataSourceFactory::BuildRequest::DoStart() {
   CallNextFactory();
 }
 
 void CompositeDataSourceFactory::BuildRequest::CallNextFactory() {
   DCHECK(!factories_.empty());
 
-  DataSourceFactory* factory = factories_.front();
+  scoped_ptr<DataSourceFactory> factory(factories_.front());
   factories_.pop_front();
 
   factory->Build(url(), base::Bind(&BuildRequest::OnBuildDone,
                                    base::Unretained(this)));
 }
 
 void CompositeDataSourceFactory::BuildRequest::OnBuildDone(
     PipelineStatus status,
     DataSource* data_source) {
 
   if (status == PIPELINE_OK) {
     DCHECK(data_source);
     RequestComplete(status, data_source);
     return;
   }
 
   DCHECK(!data_source);
   if ((status == DATASOURCE_ERROR_URL_NOT_SUPPORTED) && !factories_.empty()) {
     CallNextFactory();
     return;
   }
 
   RequestComplete(status, data_source);
 }
 
 }  // namespace media