Index: trunk/src/media/filters/decrypting_video_decoder.h |
=================================================================== |
--- trunk/src/media/filters/decrypting_video_decoder.h (revision 195011) |
+++ trunk/src/media/filters/decrypting_video_decoder.h (working copy) |
@@ -6,7 +6,7 @@ |
#define MEDIA_FILTERS_DECRYPTING_VIDEO_DECODER_H_ |
#include "base/callback.h" |
-#include "base/memory/weak_ptr.h" |
+#include "base/memory/ref_counted.h" |
#include "media/base/decryptor.h" |
#include "media/base/demuxer_stream.h" |
#include "media/base/video_decoder.h" |
@@ -34,7 +34,6 @@ |
DecryptingVideoDecoder( |
const scoped_refptr<base::MessageLoopProxy>& message_loop, |
const SetDecryptorReadyCB& set_decryptor_ready_cb); |
- virtual ~DecryptingVideoDecoder(); |
// VideoDecoder implementation. |
virtual void Initialize(const scoped_refptr<DemuxerStream>& stream, |
@@ -44,6 +43,9 @@ |
virtual void Reset(const base::Closure& closure) OVERRIDE; |
virtual void Stop(const base::Closure& closure) OVERRIDE; |
+ protected: |
+ virtual ~DecryptingVideoDecoder(); |
+ |
private: |
// For a detailed state diagram please see this link: http://goo.gl/8jAok |
// TODO(xhwang): Add a ASCII state diagram in this file after this class |
@@ -94,8 +96,6 @@ |
void DoStop(); |
scoped_refptr<base::MessageLoopProxy> message_loop_; |
- base::WeakPtrFactory<DecryptingVideoDecoder> weak_factory_; |
- base::WeakPtr<DecryptingVideoDecoder> weak_this_; |
State state_; |