diff options
| author | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-12 20:46:25 +0000 |
|---|---|---|
| committer | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-12 20:46:25 +0000 |
| commit | 025f804b7014f4f859cebbe9431942da42282cbd (patch) | |
| tree | 5b3125fdf0b1e088b9d0ca2a2538c218f165370d /media/base/seekable_buffer_unittest.cc | |
| parent | 09b1639499698897c778544f8701b6caad7bd220 (diff) | |
| download | chromium_src-025f804b7014f4f859cebbe9431942da42282cbd.zip chromium_src-025f804b7014f4f859cebbe9431942da42282cbd.tar.gz chromium_src-025f804b7014f4f859cebbe9431942da42282cbd.tar.bz2 | |
Rename media::StreamSample::kInvalidTimestamp to media::kNoTimestamp.
Old name was overly verbose.
BUG=54110
TEST=compiles
Review URL: http://codereview.chromium.org/4877002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@65989 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/base/seekable_buffer_unittest.cc')
| -rw-r--r-- | media/base/seekable_buffer_unittest.cc | 29 |
1 files changed, 13 insertions, 16 deletions
diff --git a/media/base/seekable_buffer_unittest.cc b/media/base/seekable_buffer_unittest.cc index 9602d50..b6f3132 100644 --- a/media/base/seekable_buffer_unittest.cc +++ b/media/base/seekable_buffer_unittest.cc @@ -9,7 +9,7 @@ #include "media/base/seekable_buffer.h" #include "testing/gtest/include/gtest/gtest.h" -namespace { +namespace media { class SeekableBufferTest : public testing::Test { public: @@ -291,9 +291,6 @@ TEST_F(SeekableBufferTest, AllMethods) { TEST_F(SeekableBufferTest, GetTime) { - const base::TimeDelta kInvalidTimestamp = - media::StreamSample::kInvalidTimestamp; - const struct { int64 first_time_useconds; int64 duration_useconds; @@ -301,15 +298,15 @@ TEST_F(SeekableBufferTest, GetTime) { int64 expected_time; } tests[] = { // Timestamps of 0 are treated as garbage. - { 0, 1000000, 0, kInvalidTimestamp.ToInternalValue() }, - { 0, 4000000, 0, kInvalidTimestamp.ToInternalValue() }, - { 0, 8000000, 0, kInvalidTimestamp.ToInternalValue() }, - { 0, 1000000, 4, kInvalidTimestamp.ToInternalValue() }, - { 0, 4000000, 4, kInvalidTimestamp.ToInternalValue() }, - { 0, 8000000, 4, kInvalidTimestamp.ToInternalValue() }, - { 0, 1000000, kWriteSize, kInvalidTimestamp.ToInternalValue() }, - { 0, 4000000, kWriteSize, kInvalidTimestamp.ToInternalValue() }, - { 0, 8000000, kWriteSize, kInvalidTimestamp.ToInternalValue() }, + { 0, 1000000, 0, kNoTimestamp.ToInternalValue() }, + { 0, 4000000, 0, kNoTimestamp.ToInternalValue() }, + { 0, 8000000, 0, kNoTimestamp.ToInternalValue() }, + { 0, 1000000, 4, kNoTimestamp.ToInternalValue() }, + { 0, 4000000, 4, kNoTimestamp.ToInternalValue() }, + { 0, 8000000, 4, kNoTimestamp.ToInternalValue() }, + { 0, 1000000, kWriteSize, kNoTimestamp.ToInternalValue() }, + { 0, 4000000, kWriteSize, kNoTimestamp.ToInternalValue() }, + { 0, 8000000, kWriteSize, kNoTimestamp.ToInternalValue() }, { 5, 1000000, 0, 5 }, { 5, 4000000, 0, 5 }, { 5, 8000000, 0, 5 }, @@ -321,8 +318,8 @@ TEST_F(SeekableBufferTest, GetTime) { { 5, 8000000, kWriteSize, 8000005 }, }; - // current_time() must initially return kInvalidTimestamp. - EXPECT_EQ(kInvalidTimestamp.ToInternalValue(), + // current_time() must initially return kNoTimestamp. + EXPECT_EQ(kNoTimestamp.ToInternalValue(), buffer_.current_time().ToInternalValue()); scoped_refptr<media::DataBuffer> buffer(new media::DataBuffer(kWriteSize)); @@ -348,4 +345,4 @@ TEST_F(SeekableBufferTest, GetTime) { } } -} // namespace +} // namespace media |