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

media/base/mock_filters.cc

Index: media/base/mock_filters.cc
diff --git a/media/base/mock_filters.cc b/media/base/mock_filters.cc
index a4066200f89b5b1b2346e9576ace4b5bf77d7c6c..486a9f80f26757fb61ab690449311c55dc5d5dad 100644
--- a/media/base/mock_filters.cc
+++ b/media/base/mock_filters.cc
@@ -5,6 +5,7 @@
 #include "media/base/mock_filters.h"
 
 #include "base/logging.h"
+#include "base/memory/scoped_ptr.h"
 #include "media/base/filter_host.h"
 
 using ::testing::_;
@@ -65,8 +66,8 @@ void MockDemuxerFactory::RunBuildCallback(const std::string& url,
   callback.Run(status_, NULL);
 }
 
-DemuxerFactory* MockDemuxerFactory::Clone() const {
-  return new MockDemuxerFactory(demuxer_.get());
+scoped_ptr<DemuxerFactory> MockDemuxerFactory::Clone() const {
+  return scoped_ptr<DemuxerFactory>(new MockDemuxerFactory(demuxer_.get()));
 }
 
 MockDemuxer::MockDemuxer()
@@ -124,33 +125,34 @@ MockFilterCollection::MockFilterCollection()
 
 MockFilterCollection::~MockFilterCollection() {}
 
-FilterCollection* MockFilterCollection::filter_collection(
+scoped_ptr<FilterCollection> MockFilterCollection::filter_collection(
     bool include_demuxer,
     bool run_build_callback,
     bool run_build,
     PipelineStatus build_status) const {
-  FilterCollection* collection = new FilterCollection();
+  scoped_ptr<FilterCollection> collection(new FilterCollection());
 
-  MockDemuxerFactory* demuxer_factory =
-      new MockDemuxerFactory(include_demuxer ? demuxer_ : NULL);
+  scoped_ptr<MockDemuxerFactory> demuxer_factory(
+      new MockDemuxerFactory(include_demuxer ? demuxer_ : NULL));
 
   if (build_status != PIPELINE_OK)
     demuxer_factory->SetError(build_status);
 
   if (run_build_callback) {
     ON_CALL(*demuxer_factory, Build(_, _)).WillByDefault(Invoke(
-        demuxer_factory, &MockDemuxerFactory::RunBuildCallback));
+        demuxer_factory.get(), &MockDemuxerFactory::RunBuildCallback));
   }  // else ignore Build calls.
 
   if (run_build)
     EXPECT_CALL(*demuxer_factory, Build(_, _));
 
-  collection->SetDemuxerFactory(demuxer_factory);
+  collection->SetDemuxerFactory(scoped_ptr<DemuxerFactory>(
+      demuxer_factory.release()));

[acolwell GONE FROM CHROMIUM, 2012/01/03 22:46:40]

// TODO(fischman): replace the extra scoped_ptr+release() with Pass() when
// http://crbug.com/109026 is fixed.

[Ami GONE FROM CHROMIUM, 2012/01/03 22:52:02]

Done.

   collection->AddVideoDecoder(video_decoder_);
   collection->AddAudioDecoder(audio_decoder_);
   collection->AddVideoRenderer(video_renderer_);
   collection->AddAudioRenderer(audio_renderer_);
-  return collection;
+  return collection.Pass();
 }
 
 void RunFilterCallback(::testing::Unused, const base::Closure& callback) {