Eliminate media::Buffer as a base class for media::DecoderBuffer and media::DataBuffer.

It was never a good idea in the first place.

Our usage is exclusively with DecoderBuffers or DataBuffers. There's never a case where we benefit from using Buffer as a base class aside from hiding GetWriteableData(), however it's not a compelling enough reason to keep Buffer around.

BUG=169614
TBR=dmichael

Review URL: https://codereview.chromium.org/11880008

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@176956 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 4 insertions, 4 deletions

diff --git a/media/base/audio_splicer.cc b/media/base/audio_splicer.cc
index 2efbba9..e78cd2b 100644
--- a/media/base/audio_splicer.cc
+++ b/media/base/audio_splicer.cc
@@ -35,7 +35,7 @@ void AudioSplicer::Reset() {
   received_end_of_stream_ = false;
 }
 
-bool AudioSplicer::AddInput(const scoped_refptr<Buffer>& input){
+bool AudioSplicer::AddInput(const scoped_refptr<DataBuffer>& input){
   DCHECK(!received_end_of_stream_ || input->IsEndOfStream());
 
   if (input->IsEndOfStream()) {
@@ -125,13 +125,13 @@ bool AudioSplicer::HasNextBuffer() const {
   return !output_buffers_.empty();
 }
 
-scoped_refptr<Buffer> AudioSplicer::GetNextBuffer() {
-  scoped_refptr<Buffer> ret = output_buffers_.front();
+scoped_refptr<DataBuffer> AudioSplicer::GetNextBuffer() {
+  scoped_refptr<DataBuffer> ret = output_buffers_.front();
   output_buffers_.pop_front();
   return ret;
 }
 
-void AudioSplicer::AddOutputBuffer(const scoped_refptr<Buffer>& buffer) {
+void AudioSplicer::AddOutputBuffer(const scoped_refptr<DataBuffer>& buffer) {
   output_timestamp_helper_.AddBytes(buffer->GetDataSize());
   output_buffers_.push_back(buffer);
 }