Index: media/filters/audio_renderer_impl.h |
=================================================================== |
--- media/filters/audio_renderer_impl.h (revision 182591) |
+++ media/filters/audio_renderer_impl.h (working copy) |
@@ -22,7 +22,6 @@ |
#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" |
@@ -48,7 +47,6 @@ |
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, |
@@ -82,6 +80,9 @@ |
now_cb_ = now_cb; |
} |
+ protected: |
+ virtual ~AudioRendererImpl(); |
+ |
private: |
friend class AudioRendererImplTest; |
@@ -159,8 +160,6 @@ |
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_; |