Introducing DecoderBuffer and general Buffer cleanup.

media/filters/chunk_demuxer.cc

Index: media/filters/chunk_demuxer.cc
diff --git a/media/filters/chunk_demuxer.cc b/media/filters/chunk_demuxer.cc
index 6af153a5e025a070fe61ace1edf875f2ecf84e3e..371f2559af119974952ae9ff2427b4fa7fc0e83e 100644
--- a/media/filters/chunk_demuxer.cc
+++ b/media/filters/chunk_demuxer.cc
@@ -216,7 +216,7 @@ void ChunkDemuxerStream::Flush() {
   }
 
   for (ReadCBQueue::iterator it = read_cbs.begin(); it != read_cbs.end(); ++it)
-    it->Run(scoped_refptr<Buffer>());
+    it->Run(scoped_refptr<DecoderBuffer>());
 }
 
 void ChunkDemuxerStream::Seek(base::TimeDelta time) {
@@ -325,7 +325,7 @@ bool ChunkDemuxerStream::GetBufferedRange(
 // Helper function that makes sure |read_cb| runs on |message_loop|.
 static void RunOnMessageLoop(const DemuxerStream::ReadCB& read_cb,
                              MessageLoop* message_loop,
-                             const scoped_refptr<Buffer>& buffer) {
+                             const scoped_refptr<DecoderBuffer>& buffer) {
   if (MessageLoop::current() != message_loop) {
     message_loop->PostTask(FROM_HERE, base::Bind(
         &RunOnMessageLoop, read_cb, message_loop, buffer));
@@ -337,7 +337,7 @@ static void RunOnMessageLoop(const DemuxerStream::ReadCB& read_cb,
 
 // DemuxerStream methods.
 void ChunkDemuxerStream::Read(const ReadCB& read_cb) {
-  scoped_refptr<Buffer> buffer;
+  scoped_refptr<DecoderBuffer> buffer;
 
   {
     base::AutoLock auto_lock(lock_);
@@ -430,7 +430,7 @@ void ChunkDemuxerStream::CreateReadDoneClosures_Locked(ClosureQueue* closures) {
     return;
 
   // Push enough EOS buffers to satisfy outstanding Read() requests.
-  scoped_refptr<Buffer> end_of_stream_buffer =
+  scoped_refptr<DecoderBuffer> end_of_stream_buffer =
       StreamParserBuffer::CreateEOSBuffer();
   while (!read_cbs_.empty()) {
     closures->push_back(base::Bind(read_cbs_.front(), end_of_stream_buffer));