Reland: Remove reference counting from media::VideoDecoder and friends.

media/base/video_decoder.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.
 
 #ifndef MEDIA_BASE_VIDEO_DECODER_H_
 #define MEDIA_BASE_VIDEO_DECODER_H_
 
 #include "base/callback.h"
 #include "base/memory/ref_counted.h"
 #include "media/base/pipeline_status.h"
 #include "media/base/media_export.h"
 #include "ui/gfx/size.h"
 
 namespace media {
 
 class DemuxerStream;
 class VideoFrame;
 
-class MEDIA_EXPORT VideoDecoder
-    : public base::RefCountedThreadSafe<VideoDecoder> {
+class MEDIA_EXPORT VideoDecoder {
  public:
   // Status codes for read operations on VideoDecoder.
   enum Status {
     kOk,  // Everything went as planned.
     kDecodeError,  // Decoding error happened.
     kDecryptError  // Decrypting error happened.
   };
 
+  VideoDecoder();
+  virtual ~VideoDecoder();
+
   // Initializes a VideoDecoder with the given DemuxerStream, executing the
   // |status_cb| upon completion.
   // |statistics_cb| is used to update the global pipeline statistics.
   // Note:
   // 1) No VideoDecoder calls should be made before |status_cb| is executed.
   // 2) DemuxerStream should not be accessed after the VideoDecoder is stopped.
   virtual void Initialize(const scoped_refptr<DemuxerStream>& stream,
                           const PipelineStatusCB& status_cb,
                           const StatisticsCB& statistics_cb) = 0;
 
@@ skipping 31 matching lines @@
   // have alpha so the default is false. Override and return true for decoders
   // that return formats with an alpha channel.
   virtual bool HasAlpha() const;
 
   // Returns true if the decoder currently has the ability to decode and return
   // a VideoFrame. Most implementations can allocate a new VideoFrame and hence
   // this will always return true. Override and return false for decoders that
   // use a fixed set of VideoFrames for decoding.
   virtual bool HasOutputFrameAvailable() const;
 
- protected:
-  friend class base::RefCountedThreadSafe<VideoDecoder>;
-  virtual ~VideoDecoder();
-  VideoDecoder();
-
+ private:
   DISALLOW_COPY_AND_ASSIGN(VideoDecoder);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_BASE_VIDEO_DECODER_H_