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

webkit/media/webmediaplayer_impl.cc

Index: webkit/media/webmediaplayer_impl.cc
diff --git a/webkit/media/webmediaplayer_impl.cc b/webkit/media/webmediaplayer_impl.cc
index 4753202695a03082af06fa4b108d5bc081b4c19c..1527ce66d165c71e4503c887a5999b75895d5dd6 100644
--- a/webkit/media/webmediaplayer_impl.cc
+++ b/webkit/media/webmediaplayer_impl.cc
@@ -195,26 +195,29 @@ bool WebMediaPlayerImpl::Initialize(
       new media::CompositeDataSourceFactory());
 
   if (use_simple_data_source) {
-    data_source_factory->AddFactory(simple_data_source_factory.release());
-    data_source_factory->AddFactory(buffered_data_source_factory.release());
+    data_source_factory->AddFactory(simple_data_source_factory.Pass());
+    data_source_factory->AddFactory(buffered_data_source_factory.Pass());
   } else {
-    data_source_factory->AddFactory(buffered_data_source_factory.release());
-    data_source_factory->AddFactory(simple_data_source_factory.release());
+    data_source_factory->AddFactory(buffered_data_source_factory.Pass());
+    data_source_factory->AddFactory(simple_data_source_factory.Pass());
   }
 
   scoped_ptr<media::DemuxerFactory> demuxer_factory(
-      new media::FFmpegDemuxerFactory(data_source_factory.release(),
-                                      pipeline_message_loop));
+      // TODO(fischman): hopefully the extra scoped_ptr<m::DSF>() will be
+      // unnecessary once http://codereview.chromium.org/8968032/ lands
+      // properly.
+      new media::FFmpegDemuxerFactory(scoped_ptr<media::DataSourceFactory>(
+          data_source_factory.Pass()), pipeline_message_loop));
 
   std::string source_url = GetClient()->sourceURL().spec();
 
   if (!source_url.empty()) {
     demuxer_factory.reset(
         new media::ChunkDemuxerFactory(source_url,
-                                       demuxer_factory.release(),
+                                       demuxer_factory.Pass(),
                                        proxy_));
   }
-  filter_collection_->SetDemuxerFactory(demuxer_factory.release());
+  filter_collection_->SetDemuxerFactory(demuxer_factory.Pass());
 
   // Add in the default filter factories.
   filter_collection_->AddAudioDecoder(new media::FFmpegAudioDecoder(
@@ -299,8 +302,8 @@ void WebMediaPlayerImpl::load(const WebKit::WebURL& url) {
       // that the MediaStream represents a local webcam. This will need to
       // change in the future when GetVideoDecoder is no longer hardcoded to
       // only return CaptureVideoDecoders.
-      filter_collection_->SetDemuxerFactory(
-          new media::DummyDemuxerFactory(has_video, has_audio, true));
+      filter_collection_->SetDemuxerFactory(scoped_ptr<media::DemuxerFactory>(
+          new media::DummyDemuxerFactory(has_video, has_audio, true)));
     }
   }
 
@@ -313,7 +316,7 @@ void WebMediaPlayerImpl::load(const WebKit::WebURL& url) {
   SetNetworkState(WebKit::WebMediaPlayer::Loading);
   SetReadyState(WebKit::WebMediaPlayer::HaveNothing);
   pipeline_->Start(
-      filter_collection_.release(),
+      filter_collection_.Pass(),
       url.spec(),
       base::Bind(&WebMediaPlayerProxy::PipelineInitializationCallback,
                  proxy_.get()));