Remove reference counting from media::DemuxerStream and friends.

media/filters/audio_renderer_impl.h

 // Copyright (c) 2012 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.
 
 // Audio rendering unit utilizing an AudioRendererSink to output data.
 //
 // This class lives inside three threads during it's lifetime, namely:
 // 1. Render thread
 //    Where the object is created.
 // 2. Media thread (provided via constructor)
@@ skipping 41 matching lines @@
   //
   // |set_decryptor_ready_cb| is fired when the audio decryptor is available
   // (only applicable if the stream is encrypted and we have a decryptor).
   AudioRendererImpl(const scoped_refptr<base::MessageLoopProxy>& message_loop,
                     AudioRendererSink* sink,
                     ScopedVector<AudioDecoder> decoders,
                     const SetDecryptorReadyCB& set_decryptor_ready_cb);
   virtual ~AudioRendererImpl();
 
   // AudioRenderer implementation.
-  virtual void Initialize(const scoped_refptr<DemuxerStream>& stream,
+  virtual void Initialize(DemuxerStream* stream,
                           const PipelineStatusCB& init_cb,
                           const StatisticsCB& statistics_cb,
                           const base::Closure& underflow_cb,
                           const TimeCB& time_cb,
                           const base::Closure& ended_cb,
                           const base::Closure& disabled_cb,
                           const PipelineStatusCB& error_cb) OVERRIDE;
   virtual void Play(const base::Closure& callback) OVERRIDE;
   virtual void Pause(const base::Closure& callback) OVERRIDE;
   virtual void Flush(const base::Closure& callback) OVERRIDE;
@@ skipping 80 matching lines @@
   // in the kPrerolling state.
   bool IsBeforePrerollTime(const scoped_refptr<DataBuffer>& buffer);
 
   // Called when |decoder_selector_| has selected |decoder| or is null if no
   // decoder could be selected.
   //
   // |decrypting_demuxer_stream| is non-null if a DecryptingDemuxerStream was
   // created to help decrypt the encrypted stream.
   void OnDecoderSelected(
       scoped_ptr<AudioDecoder> decoder,
-      const scoped_refptr<DecryptingDemuxerStream>& decrypting_demuxer_stream);
+      scoped_ptr<DecryptingDemuxerStream> decrypting_demuxer_stream);
 
   void ResetDecoder(const base::Closure& callback);
 
   scoped_refptr<base::MessageLoopProxy> message_loop_;
   base::WeakPtrFactory<AudioRendererImpl> weak_factory_;
   base::WeakPtr<AudioRendererImpl> weak_this_;
 
   scoped_ptr<AudioSplicer> splicer_;
 
   // The sink (destination) for rendered audio. |sink_| must only be accessed
   // on |message_loop_|. |sink_| must never be called under |lock_| or else we
   // may deadlock between |message_loop_| and the audio callback thread.
   scoped_refptr<media::AudioRendererSink> sink_;
 
   scoped_ptr<AudioDecoderSelector> decoder_selector_;
 
   // These two will be set by AudioDecoderSelector::SelectAudioDecoder().
   scoped_ptr<AudioDecoder> decoder_;
-  scoped_refptr<DecryptingDemuxerStream> decrypting_demuxer_stream_;
+  scoped_ptr<DecryptingDemuxerStream> decrypting_demuxer_stream_;
 
   // AudioParameters constructed during Initialize() based on |decoder_|.
   AudioParameters audio_parameters_;
 
   // Callbacks provided during Initialize().
   PipelineStatusCB init_cb_;
   StatisticsCB statistics_cb_;
   base::Closure underflow_cb_;
   TimeCB time_cb_;
   base::Closure ended_cb_;
@@ skipping 70 matching lines @@
   // Variables used only on the audio thread. ---------------------------------
   int actual_frames_per_buffer_;
   scoped_ptr<uint8[]> audio_buffer_;
 
   DISALLOW_COPY_AND_ASSIGN(AudioRendererImpl);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_FILTERS_AUDIO_RENDERER_IMPL_H_