Merge from Chromium at DEPS revision r190564

This commit was generated by merge_to_master.py.

Change-Id: Icadecbce29854b8fa25fd335b2c1949b5ca5d170

1 files changed, 7 insertions, 9 deletions

diff --git a/media/base/audio_decoder.h b/media/base/audio_decoder.h
index e6f09ed24e..743d1d4f77 100644
--- a/media/base/audio_decoder.h
+++ b/media/base/audio_decoder.h
@@ -13,11 +13,10 @@
 
 namespace media {
 
-class Buffer;
+class DataBuffer;
 class DemuxerStream;
 
-class MEDIA_EXPORT AudioDecoder
-    : public base::RefCountedThreadSafe<AudioDecoder> {
+class MEDIA_EXPORT AudioDecoder {
  public:
   // Status codes for read operations.
   enum Status {
@@ -26,6 +25,9 @@ class MEDIA_EXPORT AudioDecoder
     kDecodeError,
   };
 
+  AudioDecoder();
+  virtual ~AudioDecoder();
+
   // Initialize an AudioDecoder with the given DemuxerStream, executing the
   // callback upon completion.
   // statistics_cb is used to update global pipeline statistics.
@@ -43,7 +45,7 @@ class MEDIA_EXPORT AudioDecoder
   // indicate the end of the stream. A NULL buffer pointer indicates an aborted
   // Read(). This can happen if the DemuxerStream gets flushed and doesn't have
   // any more data to return.
-  typedef base::Callback<void(Status, const scoped_refptr<Buffer>&)> ReadCB;
+  typedef base::Callback<void(Status, const scoped_refptr<DataBuffer>&)> ReadCB;
   virtual void Read(const ReadCB& read_cb) = 0;
 
   // Reset decoder state, dropping any queued encoded data.
@@ -54,11 +56,7 @@ class MEDIA_EXPORT AudioDecoder
   virtual ChannelLayout channel_layout() = 0;
   virtual int samples_per_second() = 0;
 
- protected:
-  friend class base::RefCountedThreadSafe<AudioDecoder>;
-  virtual ~AudioDecoder();
-  AudioDecoder();
-
+ private:
   DISALLOW_COPY_AND_ASSIGN(AudioDecoder);
 };