| Index: media/base/seekable_buffer_unittest.cc
|
| diff --git a/media/base/seekable_buffer_unittest.cc b/media/base/seekable_buffer_unittest.cc
|
| index 06a9477fa645ab7ff0832cc54977e9ea11cea433..be1626cb91cc6e54a437d658f2ce79561562c98b 100644
|
| --- a/media/base/seekable_buffer_unittest.cc
|
| +++ b/media/base/seekable_buffer_unittest.cc
|
| @@ -225,7 +225,7 @@ TEST_F(SeekableBufferTest, SeekBackward) {
|
| TEST_F(SeekableBufferTest, GetCurrentChunk) {
|
| const int kSeekSize = kWriteSize / 3;
|
|
|
| - scoped_refptr<DataBuffer> buffer = DataBuffer::CopyFrom(data_, kWriteSize);
|
| + scoped_refptr<DataBuffer> buffer = DataBuffer::copy_from(data_, kWriteSize);
|
|
|
| const uint8* data;
|
| int size;
|
| @@ -233,13 +233,13 @@ TEST_F(SeekableBufferTest, GetCurrentChunk) {
|
|
|
| buffer_.Append(buffer.get());
|
| EXPECT_TRUE(buffer_.GetCurrentChunk(&data, &size));
|
| - EXPECT_EQ(data, buffer->GetData());
|
| - EXPECT_EQ(size, buffer->GetDataSize());
|
| + EXPECT_EQ(data, buffer->get_data());
|
| + EXPECT_EQ(size, buffer->get_data_size());
|
|
|
| buffer_.Seek(kSeekSize);
|
| EXPECT_TRUE(buffer_.GetCurrentChunk(&data, &size));
|
| - EXPECT_EQ(data, buffer->GetData() + kSeekSize);
|
| - EXPECT_EQ(size, buffer->GetDataSize() - kSeekSize);
|
| + EXPECT_EQ(data, buffer->get_data() + kSeekSize);
|
| + EXPECT_EQ(size, buffer->get_data_size() - kSeekSize);
|
| }
|
|
|
| TEST_F(SeekableBufferTest, SeekForward) {
|
| @@ -328,12 +328,12 @@ TEST_F(SeekableBufferTest, GetTime) {
|
| EXPECT_EQ(kNoTimestamp().ToInternalValue(),
|
| buffer_.current_time().ToInternalValue());
|
|
|
| - scoped_refptr<DataBuffer> buffer = DataBuffer::CopyFrom(data_, kWriteSize);
|
| + scoped_refptr<DataBuffer> buffer = DataBuffer::copy_from(data_, kWriteSize);
|
|
|
| for (size_t i = 0; i < ARRAYSIZE_UNSAFE(tests); ++i) {
|
| - buffer->SetTimestamp(base::TimeDelta::FromMicroseconds(
|
| + buffer->set_timestamp(base::TimeDelta::FromMicroseconds(
|
| tests[i].first_time_useconds));
|
| - buffer->SetDuration(base::TimeDelta::FromMicroseconds(
|
| + buffer->set_duration(base::TimeDelta::FromMicroseconds(
|
| tests[i].duration_useconds));
|
| buffer_.Append(buffer.get());
|
| EXPECT_TRUE(buffer_.Seek(tests[i].consume_bytes));
|
|
|