diff options
| author | fischman@chromium.org <fischman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-18 03:29:37 +0000 |
|---|---|---|
| committer | fischman@chromium.org <fischman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-18 03:29:37 +0000 |
| commit | eb5d608b4b2a345da0ae80097ecfc7e522301590 (patch) | |
| tree | 4471d19b8dbc00ca48944381910955d4cd22eed3 /media/base/seekable_buffer_unittest.cc | |
| parent | 47c7ec8be8c6829d7973568fe453f46046c2e818 (diff) | |
| download | chromium_src-eb5d608b4b2a345da0ae80097ecfc7e522301590.zip chromium_src-eb5d608b4b2a345da0ae80097ecfc7e522301590.tar.gz chromium_src-eb5d608b4b2a345da0ae80097ecfc7e522301590.tar.bz2 | |
buffers.cc: replaced global TimeDelta constants with fully-inlined functions.
media_log.cc: replaced global AtomicSequenceNumber with LazyInstance.
BUG=94925
TEST=none
Review URL: http://codereview.chromium.org/9225001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@118026 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/base/seekable_buffer_unittest.cc')
| -rw-r--r-- | media/base/seekable_buffer_unittest.cc | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/media/base/seekable_buffer_unittest.cc b/media/base/seekable_buffer_unittest.cc index cf87b5d..2cb547f 100644 --- a/media/base/seekable_buffer_unittest.cc +++ b/media/base/seekable_buffer_unittest.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -298,15 +298,15 @@ TEST_F(SeekableBufferTest, GetTime) { int64 expected_time; } tests[] = { // Timestamps of 0 are treated as garbage. - { 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() }, + { 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 }, @@ -318,8 +318,8 @@ TEST_F(SeekableBufferTest, GetTime) { { 5, 8000000, kWriteSize, 8000005 }, }; - // current_time() must initially return kNoTimestamp. - EXPECT_EQ(kNoTimestamp.ToInternalValue(), + // current_time() must initially return kNoTimestamp(). + EXPECT_EQ(kNoTimestamp().ToInternalValue(), buffer_.current_time().ToInternalValue()); scoped_refptr<media::DataBuffer> buffer(new media::DataBuffer(kWriteSize)); |