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

media/tools/player_wtl/movie.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 "media/tools/player_wtl/movie.h"
 
 #include "base/memory/singleton.h"
 #include "base/threading/platform_thread.h"
 #include "base/utf_string_conversions.h"
 #include "media/audio/audio_manager.h"
@@ skipping 54 matching lines @@
   }
 
   message_loop_factory_.reset(new media::MessageLoopFactoryImpl());
 
   MessageLoop* pipeline_loop =
       message_loop_factory_->GetMessageLoop("PipelineThread");
   pipeline_ = new PipelineImpl(pipeline_loop, new media::MediaLog());
 
   // Create filter collection.
   scoped_ptr<FilterCollection> collection(new FilterCollection());
-  collection->SetDemuxerFactory(new FFmpegDemuxerFactory(
-      new FileDataSourceFactory(), pipeline_loop));
+  collection->SetDemuxerFactory(
+      scoped_ptr<DemuxerFactory>(new FFmpegDemuxerFactory(
+          scoped_ptr<DataSourceFactory>(new FileDataSourceFactory()),
+          pipeline_loop)));
   collection->AddAudioDecoder(new FFmpegAudioDecoder(
       message_loop_factory_->GetMessageLoop("AudioDecoderThread")));
   collection->AddVideoDecoder(new FFmpegVideoDecoder(
       message_loop_factory_->GetMessageLoop("VideoDecoderThread")));
 
   if (enable_audio_) {
     collection->AddAudioRenderer(
         new ReferenceAudioRenderer(audio_manager_));
   } else {
     collection->AddAudioRenderer(new media::NullAudioRenderer());
   }
   collection->AddVideoRenderer(video_renderer);
 
   // Create and start our pipeline.
   media::PipelineStatusNotification note;
-  pipeline_->Start(collection.release(), WideToUTF8(std::wstring(url)),
+  pipeline_->Start(collection.Pass(), WideToUTF8(string16(url)),
                    note.Callback());
   // Wait until the pipeline is fully initialized.
   note.Wait();
   if (note.status() != PIPELINE_OK)
     return false;
   pipeline_->SetPlaybackRate(play_rate_);
   return true;
 }
 
 void Movie::Play(float rate) {
@@ skipping 73 matching lines @@
 void Movie::Close() {
   if (pipeline_) {
     pipeline_->Stop(media::PipelineStatusCB());
     pipeline_ = NULL;
   }
 
   message_loop_factory_.reset();
 }
 
 }  // namespace media