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

media/tools/player_x11/player_x11.cc

 // 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.
 
 #include <X11/keysym.h>
 #include <X11/Xlib.h>
 #include <signal.h>
 
 #include <iostream>  // NOLINT
 
@@ skipping 95 matching lines @@
   // Load media libraries.
   if (!media::InitializeMediaLibrary(FilePath())) {
     std::cout << "Unable to initialize the media library." << std::endl;
     return false;
   }
 
   // Create our filter factories.
   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(
       message_loop_factory->GetMessageLoop("VideoDecoderThread")));
 
   // Create our video renderer and save a reference to it for painting.
   g_video_renderer = new media::VideoRendererBase(
       base::Bind(&Paint, paint_message_loop, paint_cb),
       base::Bind(&SetOpaque));
   collection->AddVideoRenderer(g_video_renderer);
 
   if (enable_audio) {
     collection->AddAudioRenderer(
         new media::ReferenceAudioRenderer(g_audio_manager));
   } else {
     collection->AddAudioRenderer(new media::NullAudioRenderer());
   }
 
   // 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();
   if (note.status() != media::PIPELINE_OK) {
     std::cout << "InitPipeline: " << note.status() << std::endl;
     (*pipeline)->Stop(media::PipelineStatusCB());
     return false;
   }
 
   // And start the playback.
@@ skipping 152 matching lines @@
   // Cleanup tasks.
   message_loop_factory.reset();
 
   thread->Stop();
   XDestroyWindow(g_display, g_window);
   XCloseDisplay(g_display);
   g_audio_manager = NULL;
 
   return 0;
 }