Remove reference counting from media::Demuxer and friends.

media/base/pipeline.h

Index: media/base/pipeline.h
diff --git a/media/base/pipeline.h b/media/base/pipeline.h
index efd327d445270e01a5c6c9444ad6978c0dec8c9e..34e36f0ad2d4ee4bda3445b76b760b260b7f352b 100644
--- a/media/base/pipeline.h
+++ b/media/base/pipeline.h
@@ -442,8 +442,6 @@ class MEDIA_EXPORT Pipeline
   // Set to true in DisableAudioRendererTask().
   bool audio_disabled_;
 
-  scoped_ptr<FilterCollection> filter_collection_;
-
   // Temporary callback used for Start() and Seek().
   PipelineStatusCB seek_cb_;
 
@@ -456,14 +454,17 @@ class MEDIA_EXPORT Pipeline
   BufferingStateCB buffering_state_cb_;
   base::Closure duration_change_cb_;
 
-  // Renderer references used for setting the volume, playback rate, and
-  // determining when playback has finished.
+  // Contains the demuxer and renderers to use when initializing.
+  scoped_ptr<FilterCollection> filter_collection_;
+
+  // Holds the initialized demuxer. Used for seeking. Owned by client.
+  Demuxer* demuxer_;
+
+  // Holds the initialized renderers. Used for setting the volume,
+  // playback rate, and determining when playback has finished.
   scoped_ptr<AudioRenderer> audio_renderer_;
   scoped_ptr<VideoRenderer> video_renderer_;
 
-  // Demuxer reference used for setting the preload value.
-  scoped_refptr<Demuxer> demuxer_;
-
   PipelineStatistics statistics_;
 
   // Time of pipeline creation; is non-zero only until the pipeline first