Revert r180578, r180591, and r180604 from 1410 branch.

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)
 //    All AudioDecoder methods are called on this thread.
 // 3. Audio thread created by the AudioRendererSink.
 //    Render() is called here where audio data is decoded into raw PCM data.
 //
 // AudioRendererImpl talks to an AudioRendererAlgorithm that takes care of
 // queueing audio data and stretching/shrinking audio data when playback rate !=
 // 1.0 or 0.0.
 
 #ifndef MEDIA_FILTERS_AUDIO_RENDERER_IMPL_H_
 #define MEDIA_FILTERS_AUDIO_RENDERER_IMPL_H_
 
 #include <deque>
 
 #include "base/gtest_prod_util.h"
-#include "base/memory/weak_ptr.h"
 #include "base/synchronization/lock.h"
 #include "media/base/audio_decoder.h"
 #include "media/base/audio_renderer.h"
 #include "media/base/audio_renderer_sink.h"
 #include "media/base/decryptor.h"
 #include "media/filters/audio_renderer_algorithm.h"
 
 namespace base {
 class MessageLoopProxy;
 }
 
 namespace media {
 
 class AudioDecoderSelector;
 class AudioSplicer;
 class DecryptingDemuxerStream;
 
 class MEDIA_EXPORT AudioRendererImpl
     : public AudioRenderer,
       NON_EXPORTED_BASE(public AudioRendererSink::RenderCallback) {
  public:
   // An AudioRendererSink is used as the destination for the rendered audio.
   AudioRendererImpl(const scoped_refptr<base::MessageLoopProxy>& message_loop,
                     AudioRendererSink* sink,
                     const SetDecryptorReadyCB& set_decryptor_ready_cb);
-  virtual ~AudioRendererImpl();
 
   // AudioRenderer implementation.
   virtual void Initialize(const scoped_refptr<DemuxerStream>& stream,
                           const AudioDecoderList& decoders,
                           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,
@@ skipping 13 matching lines @@
   // instead of some number of silence frames.  Must be called prior to
   // Initialize().
   void DisableUnderflowForTesting();
 
   // Allows injection of a custom time callback for non-realtime testing.
   typedef base::Callback<base::Time()> NowCB;
   void set_now_cb_for_testing(const NowCB& now_cb) {
     now_cb_ = now_cb;
   }
 
+ protected:
+  virtual ~AudioRendererImpl();
+
  private:
   friend class AudioRendererImplTest;
 
   // Callback from the audio decoder delivering decoded audio samples.
   void DecodedAudioReady(AudioDecoder::Status status,
                          const scoped_refptr<DataBuffer>& buffer);
 
   // Handles buffers that come out of |splicer_|.
   // Returns true if more buffers are needed.
   bool HandleSplicerBuffer(const scoped_refptr<DataBuffer>& buffer);
@@ skipping 57 matching lines @@
   // Note: |decoder_selector| is passed here to keep the AudioDecoderSelector
   // alive until OnDecoderSelected() finishes.
   void OnDecoderSelected(
       scoped_ptr<AudioDecoderSelector> decoder_selector,
       const scoped_refptr<AudioDecoder>& selected_decoder,
       const scoped_refptr<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_;
 
   SetDecryptorReadyCB set_decryptor_ready_cb_;
 
@@ skipping 83 matching lines @@
   // Variables used only on the audio thread. ---------------------------------
   int actual_frames_per_buffer_;
   scoped_array<uint8> audio_buffer_;
 
   DISALLOW_COPY_AND_ASSIGN(AudioRendererImpl);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_FILTERS_AUDIO_RENDERER_IMPL_H_