Introducing DecoderBuffer and general Buffer cleanup.

media/filters/ffmpeg_demuxer_unittest.cc

 // 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.
 
 #include <algorithm>
 #include <deque>
 #include <string>
 
 #include "base/file_path.h"
 #include "base/file_util.h"
@@ skipping 424 matching lines @@
   message_loop_.RunAllPending();
 }
 
 // A mocked callback specialization for calling Read().  Since RunWithParams()
 // is mocked we don't need to pass in object or method pointers.
 class MockReadCB : public base::RefCountedThreadSafe<MockReadCB> {
  public:
   MockReadCB() {}
 
   MOCK_METHOD0(OnDelete, void());
-  MOCK_METHOD1(Run, void(const scoped_refptr<Buffer>& buffer));
+  MOCK_METHOD1(Run, void(const scoped_refptr<DecoderBuffer>& buffer));
 
  protected:
   virtual ~MockReadCB() {
     OnDelete();
   }
 
  private:
   friend class base::RefCountedThreadSafe<MockReadCB>;
 
   DISALLOW_COPY_AND_ASSIGN(MockReadCB);
@@ skipping 317 matching lines @@
 TEST_F(FFmpegDemuxerTest, UnsupportedVideoSupportedAudioDemux) {
   CreateDemuxer("vorbis_audio_wmv_video.mkv");
   InitializeDemuxer();
 
   // Ensure the expected streams are present.
   EXPECT_FALSE(demuxer_->GetStream(DemuxerStream::VIDEO));
   EXPECT_TRUE(demuxer_->GetStream(DemuxerStream::AUDIO));
 }
 
 }  // namespace media