Revert 194993 "Remove reference counting from media::VideoDecode..."

trunk/src/media/filters/vpx_video_decoder.h

Index: trunk/src/media/filters/vpx_video_decoder.h
===================================================================
--- trunk/src/media/filters/vpx_video_decoder.h	(revision 195011)
+++ trunk/src/media/filters/vpx_video_decoder.h	(working copy)
@@ -6,7 +6,7 @@
 #define MEDIA_FILTERS_VPX_VIDEO_DECODER_H_
 
 #include "base/callback.h"
-#include "base/memory/weak_ptr.h"
+#include "base/memory/ref_counted.h"
 #include "media/base/demuxer_stream.h"
 #include "media/base/video_decoder.h"
 
@@ -23,7 +23,6 @@
  public:
   explicit VpxVideoDecoder(
       const scoped_refptr<base::MessageLoopProxy>& message_loop);
-  virtual ~VpxVideoDecoder();
 
   // VideoDecoder implementation.
   virtual void Initialize(const scoped_refptr<DemuxerStream>& stream,
@@ -33,6 +32,9 @@
   virtual void Reset(const base::Closure& closure) OVERRIDE;
   virtual void Stop(const base::Closure& closure) OVERRIDE;
 
+ protected:
+  virtual ~VpxVideoDecoder();
+
  private:
   enum DecoderState {
     kUninitialized,
@@ -64,8 +66,6 @@
                       scoped_refptr<VideoFrame>* video_frame);
 
   scoped_refptr<base::MessageLoopProxy> message_loop_;
-  base::WeakPtrFactory<VpxVideoDecoder> weak_factory_;
-  base::WeakPtr<VpxVideoDecoder> weak_this_;
 
   DecoderState state_;