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

media/tools/player_x11/player_x11.cc

Index: media/tools/player_x11/player_x11.cc
diff --git a/media/tools/player_x11/player_x11.cc b/media/tools/player_x11/player_x11.cc
index ee4d9abbf7e2e04d37af9e9574b149fea7e71df3..11188dbc1f070349c834dae4e96d13b0ce797994 100644
--- a/media/tools/player_x11/player_x11.cc
+++ b/media/tools/player_x11/player_x11.cc
@@ -113,8 +113,9 @@ bool InitPipeline(MessageLoop* message_loop,
   scoped_ptr<media::FilterCollection> collection(
       new media::FilterCollection());
   collection->SetDemuxerFactory(
-      new media::FFmpegDemuxerFactory(
-          new media::FileDataSourceFactory(), message_loop));
+      scoped_ptr<media::DemuxerFactory>(
+          new media::FFmpegDemuxerFactory(scoped_ptr<media::DataSourceFactory>(
+              new media::FileDataSourceFactory()), message_loop)));
   collection->AddAudioDecoder(new media::FFmpegAudioDecoder(
       message_loop_factory->GetMessageLoop("AudioDecoderThread")));
   collection->AddVideoDecoder(new media::FFmpegVideoDecoder(
@@ -136,7 +137,7 @@ bool InitPipeline(MessageLoop* message_loop,
   // Create the pipeline and start it.
   *pipeline = new media::PipelineImpl(message_loop, new media::MediaLog());
   media::PipelineStatusNotification note;
-  (*pipeline)->Start(collection.release(), filename, note.Callback());
+  (*pipeline)->Start(collection.Pass(), filename, note.Callback());
 
   // Wait until the pipeline is fully initialized.
   note.Wait();