Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(9)

Unified Diff: media/base/seekable_buffer_unittest.cc

Issue 9225001: Remove two static initializers (media/base/{buffers,media_log}.cc) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 8 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: media/base/seekable_buffer_unittest.cc
diff --git a/media/base/seekable_buffer_unittest.cc b/media/base/seekable_buffer_unittest.cc
index cf87b5d954a72e3957fa7ec1603098e6a5ba255c..c389cad9e5b8110cdc215c19003e23f30598265c 100644
--- a/media/base/seekable_buffer_unittest.cc
+++ b/media/base/seekable_buffer_unittest.cc
@@ -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));

Powered by Google App Engine
This is Rietveld 408576698