Merge from Chromium at DEPS revision r210036

This commit was generated by merge_to_master.py.

Change-Id: Ib0e33a83ad5dfa541481e83d7acfc6970e68f471

1 files changed, 0 insertions, 46 deletions

diff --git a/media/base/data_buffer.cc b/media/base/data_buffer.cc
index 9bd67d5928..d0b40eed1a 100644
--- a/media/base/data_buffer.cc
+++ b/media/base/data_buffer.cc
@@ -49,50 +49,4 @@ scoped_refptr<DataBuffer> DataBuffer::CopyFrom(const uint8* data, int size) {
 scoped_refptr<DataBuffer> DataBuffer::CreateEOSBuffer() {
   return make_scoped_refptr(new DataBuffer(NULL, 0));
 }
-
-base::TimeDelta DataBuffer::GetTimestamp() const {
-  DCHECK(!IsEndOfStream());
-  return timestamp_;
-}
-
-void DataBuffer::SetTimestamp(const base::TimeDelta& timestamp) {
-  DCHECK(!IsEndOfStream());
-  timestamp_ = timestamp;
-}
-
-base::TimeDelta DataBuffer::GetDuration() const {
-  DCHECK(!IsEndOfStream());
-  return duration_;
-}
-
-void DataBuffer::SetDuration(const base::TimeDelta& duration) {
-  DCHECK(!IsEndOfStream());
-  duration_ = duration;
-}
-
-bool DataBuffer::IsEndOfStream() const {
-  return data_ == NULL;
-}
-
-const uint8* DataBuffer::GetData() const {
-  DCHECK(!IsEndOfStream());
-  return data_.get();
-}
-
-uint8* DataBuffer::GetWritableData() {
-  DCHECK(!IsEndOfStream());
-  return data_.get();
-}
-
-int DataBuffer::GetDataSize() const {
-  DCHECK(!IsEndOfStream());
-  return data_size_;
-}
-
-void DataBuffer::SetDataSize(int data_size) {
-  DCHECK(!IsEndOfStream());
-  CHECK_LE(data_size, buffer_size_);
-  data_size_ = data_size;
-}
-
 }  // namespace media