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

media/base/mock_filters.h

 // 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.
 //
 // A new breed of mock media filters, this time using gmock!  Feel free to add
 // actions if you need interesting side-effects (i.e., copying data to the
 // buffer passed into MockDataSource::Read()).
 //
 // Don't forget you can use StrictMock<> and NiceMock<> if you want the mock
 // filters to fail the test or do nothing when an unexpected method is called.
@@ skipping 130 matching lines @@
  public:
   explicit MockDemuxerFactory(MockDemuxer* demuxer);
   virtual ~MockDemuxerFactory();
 
   void SetError(PipelineStatus error);
   void RunBuildCallback(const std::string& url, const BuildCallback& callback);
 
   // 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_;
   PipelineStatus status_;
 
   DISALLOW_COPY_AND_ASSIGN(MockDemuxerFactory);
 };
 
 class MockDemuxerStream : public DemuxerStream {
  public:
@@ skipping 125 matching lines @@
   MockFilterCollection();
   virtual ~MockFilterCollection();
 
   // Mock accessors.
   MockDemuxer* demuxer() const { return demuxer_; }
   MockVideoDecoder* video_decoder() const { return video_decoder_; }
   MockAudioDecoder* audio_decoder() const { return audio_decoder_; }
   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_;
   scoped_refptr<MockVideoDecoder> video_decoder_;
   scoped_refptr<MockAudioDecoder> audio_decoder_;
   scoped_refptr<MockVideoRenderer> video_renderer_;
   scoped_refptr<MockAudioRenderer> audio_renderer_;
 
   DISALLOW_COPY_AND_ASSIGN(MockFilterCollection);
 };
@@ skipping 33 matching lines @@
  public:
   MockStatisticsCallback();
   ~MockStatisticsCallback();
 
   MOCK_METHOD1(OnStatistics, void(const media::PipelineStatistics& statistics));
 };
 
 }  // namespace media
 
 #endif  // MEDIA_BASE_MOCK_FILTERS_H_