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"
 
 namespace media {
 
 class CompositeDataSourceFactory::BuildRequest
     : public AsyncDataSourceFactoryBase::BuildRequest {
  public:
   BuildRequest(const std::string& url, const BuildCallback& callback,
                const FactoryList& factories);
   ~BuildRequest();
 
  protected:
   // AsyncDataSourceFactoryBase::BuildRequest method.
   virtual void DoStart();
 
  private:
   void CallNextFactory();
   void OnBuildDone(PipelineStatus status, DataSource* data_source);
 
-  FactoryList factories_;
+  FactoryList factories_;  // Not owned by this class.
 };
 
 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());
+    new_factory->AddFactory((*itr)->Clone().Pass());
   }
 
-  return new_factory;
+  // TODO(fischman): replace the extra scoped_ptr+release() with Pass() when
+  // http://crbug.com/109026 is fixed.
+  return scoped_ptr<DataSourceFactory>(new_factory.release());
 }
 
 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 37 matching lines @@
   DCHECK(!data_source);
   if ((status == DATASOURCE_ERROR_URL_NOT_SUPPORTED) && !factories_.empty()) {
     CallNextFactory();
     return;
   }
 
   RequestComplete(status, data_source);
 }
 
 }  // namespace media