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

media/base/mock_filters.h

Index: media/base/mock_filters.h
diff --git a/media/base/mock_filters.h b/media/base/mock_filters.h
index 5f8a5d7e5c47ac2a723a7781b9f93b888e36ad7b..c946a615f9b07f0bf8e50951f6f50f3bac8b3f5e 100644
--- a/media/base/mock_filters.h
+++ b/media/base/mock_filters.h
@@ -148,7 +148,7 @@ class MockDemuxerFactory : public DemuxerFactory {
   // DemuxerFactory methods.
   MOCK_METHOD2(Build, void(const std::string& url,
                            const BuildCallback& callback));
-  virtual DemuxerFactory* Clone() const;
+  virtual scoped_ptr<DemuxerFactory> Clone() const;
 
  private:
   scoped_refptr<MockDemuxer> demuxer_;
@@ -294,14 +294,13 @@ class MockFilterCollection {
   MockVideoRenderer* video_renderer() const { return video_renderer_; }
   MockAudioRenderer* audio_renderer() const { return audio_renderer_; }
 
-  FilterCollection* filter_collection() const {
-    return filter_collection(true, true, true, PIPELINE_OK);
+  scoped_ptr<FilterCollection> filter_collection() const {
+    return filter_collection(true, true, true, PIPELINE_OK).Pass();
   }
 
-  FilterCollection* filter_collection(bool include_demuxer,
-                                      bool run_build_callback,
-                                      bool run_build,
-                                      PipelineStatus build_status) const;
+  scoped_ptr<FilterCollection> filter_collection(
+      bool include_demuxer, bool run_build_callback, bool run_build,
+      PipelineStatus build_status) const;
 
  private:
   scoped_refptr<MockDemuxer> demuxer_;