4 files changed, 15 insertions, 26 deletions
diff --git a/media/base/buffers.h b/media/base/buffers.h
index 1b33415..9149465 100644
--- a/media/base/buffers.h
+++ b/media/base/buffers.h
@@ -103,23 +103,6 @@ class Buffer : public StreamSample {
   virtual ~Buffer() {}
 };
 
-
-class WritableBuffer : public Buffer  {
- public:
-  // Returns a read-write pointer to the buffer data.
-  virtual uint8* GetWritableData() = 0;
-
-  // Updates the size of valid data in bytes, which must be less than or equal
-  // to GetBufferSize().
-  virtual void SetDataSize(size_t data_size) = 0;
-
-  // Returns the size of the underlying buffer.
-  virtual size_t GetBufferSize() const = 0;
-
- protected:
-  virtual ~WritableBuffer() {}
-};
-
 }  // namespace media
 
 #endif  // MEDIA_BASE_BUFFERS_H_
diff --git a/media/base/data_buffer.h b/media/base/data_buffer.h
index 26ecb8a..36fbb85 100644
--- a/media/base/data_buffer.h
+++ b/media/base/data_buffer.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2008-2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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.
 
-// A simple implementation of WritableBuffer that takes ownership of
-// the given data pointer.
+// A simple implementation of Buffer that takes ownership of the given data
+// pointer.
 //
 // DataBuffer assumes that memory was allocated with new uint8[].
 
@@ -15,7 +15,7 @@
 
 namespace media {
 
-class DataBuffer : public WritableBuffer {
+class DataBuffer : public Buffer {
  public:
   // Takes ownership of the passed |buffer|, assumes valid data of size
   // |buffer_size|.
@@ -29,9 +29,14 @@ class DataBuffer : public WritableBuffer {
   virtual const uint8* GetData() const;
   virtual size_t GetDataSize() const;
 
-  // WritableBuffer implementation.
+  // Returns a read-write pointer to the buffer data.
   virtual uint8* GetWritableData();
+
+  // Updates the size of valid data in bytes, which must be less than or equal
+  // to GetBufferSize().
   virtual void SetDataSize(size_t data_size);
+
+  // Returns the size of the underlying buffer.
   virtual size_t GetBufferSize() const;
 
  protected:
@@ -41,6 +46,8 @@ class DataBuffer : public WritableBuffer {
   scoped_array<uint8> data_;
   size_t buffer_size_;
   size_t data_size_;
+
+  DISALLOW_COPY_AND_ASSIGN(DataBuffer);
 };
 
 }  // namespace media
diff --git a/media/base/data_buffer_unittest.cc b/media/base/data_buffer_unittest.cc
index 8e40d1a..8c870cf 100644
--- a/media/base/data_buffer_unittest.cc
+++ b/media/base/data_buffer_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2008-2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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.
 
@@ -35,7 +35,7 @@ TEST(DataBufferTest, StreamSampleImpl) {
   EXPECT_FALSE(buffer->IsDiscontinuous());
 }
 
-TEST(DataBufferTest, Ctors) {
+TEST(DataBufferTest, Constructors) {
   const size_t kTestSize = 10;
 
   scoped_refptr<DataBuffer> buffer(new DataBuffer(0));
@@ -46,7 +46,7 @@ TEST(DataBufferTest, Ctors) {
   EXPECT_EQ(kTestSize, buffer2->GetBufferSize());
 }
 
-TEST(DataBufferTest, WritableBufferImpl) {
+TEST(DataBufferTest, ReadingWriting) {
   const char kData[] = "hello";
   const size_t kDataSize = arraysize(kData);
   const char kNewData[] = "chromium";
diff --git a/media/base/filters.h b/media/base/filters.h
index d12e3e8..bec7d39 100644
--- a/media/base/filters.h
+++ b/media/base/filters.h
@@ -42,7 +42,6 @@ class Decoder;
 class DemuxerStream;
 class FilterHost;
 class MediaFilter;
-class WritableBuffer;
 
 // Identifies the type of filter implementation. Each filter has to be one of
 // the following types. This is used to identify filter object during