Remove reference counting from media::Demuxer and friends.

media/filters/video_frame_stream.h

Index: media/filters/video_frame_stream.h
diff --git a/media/filters/video_frame_stream.h b/media/filters/video_frame_stream.h
index 193ffc626d60cf9e569476ba46ac1bead2afa5ac..7d1dbbc4cb511794480b70bdcc4ad550fb8176a8 100644
--- a/media/filters/video_frame_stream.h
+++ b/media/filters/video_frame_stream.h
@@ -39,10 +39,11 @@ class MEDIA_EXPORT VideoFrameStream : public DemuxerStream {
   VideoFrameStream(const scoped_refptr<base::MessageLoopProxy>& message_loop,
                    ScopedVector<VideoDecoder> decoders,
                    const SetDecryptorReadyCB& set_decryptor_ready_cb);
+  virtual ~VideoFrameStream();
 
   // Initializes the VideoFrameStream and returns the initialization result
   // through |init_cb|. Note that |init_cb| is always called asynchronously.
-  void Initialize(const scoped_refptr<DemuxerStream>& stream,
+  void Initialize(DemuxerStream* stream,
                   const StatisticsCB& statistics_cb,
                   const InitCB& init_cb);
 
@@ -77,9 +78,6 @@ class MEDIA_EXPORT VideoFrameStream : public DemuxerStream {
   virtual Type type() OVERRIDE;
   virtual void EnableBitstreamConverter() OVERRIDE;
 
- protected:
-  virtual ~VideoFrameStream();
-
  private:
   enum State {
     UNINITIALIZED,
@@ -92,7 +90,7 @@ class MEDIA_EXPORT VideoFrameStream : public DemuxerStream {
   // is created to help decrypt the encrypted stream.
   void OnDecoderSelected(
       scoped_ptr<VideoDecoder> selected_decoder,
-      const scoped_refptr<DecryptingDemuxerStream>& decrypting_demuxer_stream);
+      scoped_ptr<DecryptingDemuxerStream> decrypting_demuxer_stream);
 
   // Callback for VideoDecoder::Read().
   void OnFrameRead(const VideoDecoder::Status status,
@@ -117,11 +115,11 @@ class MEDIA_EXPORT VideoFrameStream : public DemuxerStream {
 
   VideoDecoderSelector decoder_selector_;
 
-  scoped_refptr<DemuxerStream> stream_;
+  DemuxerStream* stream_;
 
   // These two will be set by VideoDecoderSelector::SelectVideoDecoder().
   scoped_ptr<VideoDecoder> decoder_;
-  scoped_refptr<DecryptingDemuxerStream> decrypting_demuxer_stream_;
+  scoped_ptr<DecryptingDemuxerStream> decrypting_demuxer_stream_;
 
   DISALLOW_COPY_AND_ASSIGN(VideoFrameStream);
 };