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

media/filters/ffmpeg_demuxer_factory.cc

Index: media/filters/ffmpeg_demuxer_factory.cc
diff --git a/media/filters/ffmpeg_demuxer_factory.cc b/media/filters/ffmpeg_demuxer_factory.cc
index dddda76b217c1862510b09701eb5e7f91ea277b8..c83d4959303c0d7cc2cb56caab2032901ddf9990 100644
--- a/media/filters/ffmpeg_demuxer_factory.cc
+++ b/media/filters/ffmpeg_demuxer_factory.cc
@@ -11,9 +11,9 @@
 namespace media {
 
 FFmpegDemuxerFactory::FFmpegDemuxerFactory(
-    DataSourceFactory* data_source_factory,
+    scoped_ptr<DataSourceFactory> data_source_factory,
     MessageLoop* loop)
-    : data_source_factory_(data_source_factory), loop_(loop) {}
+    : data_source_factory_(data_source_factory.Pass()), loop_(loop) {}
 
 FFmpegDemuxerFactory::~FFmpegDemuxerFactory() {}
 
@@ -52,8 +52,9 @@ void FFmpegDemuxerFactory::Build(const std::string& url,
                  cb, loop_, local_source));
 }
 
-DemuxerFactory* FFmpegDemuxerFactory::Clone() const {
-  return new FFmpegDemuxerFactory(data_source_factory_->Clone(), loop_);
+scoped_ptr<DemuxerFactory> FFmpegDemuxerFactory::Clone() const {
+  return scoped_ptr<DemuxerFactory>(
+      new FFmpegDemuxerFactory(data_source_factory_->Clone(), loop_));
 }
 
 }  // namespace media