Remove reference counting from media::Demuxer and friends.

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 7b029fcc0d1f4fcf30a2a75f8a11cf9981c322d1..688852302ff3097c810a348bc793786ce6e6360a 100644
--- a/media/tools/player_x11/player_x11.cc
+++ b/media/tools/player_x11/player_x11.cc
@@ -111,9 +111,9 @@ bool InitPipeline(const scoped_refptr<base::MessageLoopProxy>& message_loop,
   scoped_ptr<media::FilterCollection> collection(
       new media::FilterCollection());
   media::FFmpegNeedKeyCB need_key_cb = base::Bind(&NeedKey);
-  collection->SetDemuxer(new media::FFmpegDemuxer(message_loop, data_source,
-                                                  need_key_cb));
-
+  scoped_ptr<Demuxer> demuxer(new media::FFmpegDemuxer(
+      message_loop, data_source, need_key_cb));
+  collection->SetDemuxer(demuxer.Pass());
 
   ScopedVector<media::VideoDecoder> video_decoders;
   video_decoders.push_back(new media::FFmpegVideoDecoder(message_loop));