| Index: media/base/audio_splicer_unittest.cc
|
| diff --git a/media/base/audio_splicer_unittest.cc b/media/base/audio_splicer_unittest.cc
|
| index f7fc79fe9a9e0c01e16807a54178242cdb3e7758..de674d70ce8fb95661a1890c86b42670473dba17 100644
|
| --- a/media/base/audio_splicer_unittest.cc
|
| +++ b/media/base/audio_splicer_unittest.cc
|
| @@ -434,7 +434,7 @@ TEST_F(AudioSplicerTest, PartialOverlapCrossfade) {
|
| EXPECT_FALSE(splicer_.HasNextBuffer());
|
|
|
| // |overlapping_buffer| completes the splice.
|
| - splicer_.SetSpliceTimestamp(kNoTimestamp());
|
| + splicer_.SetSpliceTimestamp(kNoTimestamp);
|
| EXPECT_TRUE(AddInput(overlapping_buffer));
|
| ASSERT_TRUE(splicer_.HasNextBuffer());
|
|
|
| @@ -510,7 +510,7 @@ TEST_F(AudioSplicerTest, PartialOverlapCrossfadeEndOfStream) {
|
|
|
| // |overlapping_buffer| should not have enough data to complete the splice, so
|
| // ensure output is not available.
|
| - splicer_.SetSpliceTimestamp(kNoTimestamp());
|
| + splicer_.SetSpliceTimestamp(kNoTimestamp);
|
| EXPECT_TRUE(AddInput(overlapping_buffer));
|
| EXPECT_FALSE(splicer_.HasNextBuffer());
|
|
|
| @@ -570,7 +570,7 @@ TEST_F(AudioSplicerTest, PartialOverlapCrossfadeShortPreSplice) {
|
| EXPECT_FALSE(splicer_.HasNextBuffer());
|
|
|
| // |overlapping_buffer| completes the splice.
|
| - splicer_.SetSpliceTimestamp(kNoTimestamp());
|
| + splicer_.SetSpliceTimestamp(kNoTimestamp);
|
| EXPECT_TRUE(AddInput(overlapping_buffer));
|
|
|
| const int kExpectedPreSpliceSize = 55;
|
| @@ -636,7 +636,7 @@ TEST_F(AudioSplicerTest, IncorrectlyMarkedSplice) {
|
|
|
| // |second_buffer| should complete the supposed splice, so ensure output is
|
| // now available.
|
| - splicer_.SetSpliceTimestamp(kNoTimestamp());
|
| + splicer_.SetSpliceTimestamp(kNoTimestamp);
|
| EXPECT_TRUE(AddInput(second_buffer));
|
|
|
| VerifyNextBuffer(first_buffer);
|
| @@ -677,7 +677,7 @@ TEST_F(AudioSplicerTest, IncorrectlyMarkedSpliceWithGap) {
|
| // Do not add |gap_buffer|.
|
|
|
| // |second_buffer| will complete the supposed splice.
|
| - splicer_.SetSpliceTimestamp(kNoTimestamp());
|
| + splicer_.SetSpliceTimestamp(kNoTimestamp);
|
| EXPECT_TRUE(AddInput(second_buffer));
|
|
|
| VerifyNextBuffer(gap_buffer);
|
| @@ -719,7 +719,7 @@ TEST_F(AudioSplicerTest, IncorrectlyMarkedSpliceWithBadGap) {
|
| // Do not add |gap_buffer|.
|
|
|
| // |second_buffer| will complete the supposed splice.
|
| - splicer_.SetSpliceTimestamp(kNoTimestamp());
|
| + splicer_.SetSpliceTimestamp(kNoTimestamp);
|
| EXPECT_FALSE(AddInput(second_buffer));
|
| }
|
|
|
| @@ -746,7 +746,7 @@ TEST_F(AudioSplicerTest, IncorrectlyMarkedPastSplice) {
|
| // |third_buffer| will complete the supposed splice. The buffer size is set
|
| // such that unchecked the splicer would try to trim off a negative number of
|
| // frames.
|
| - splicer_.SetSpliceTimestamp(kNoTimestamp());
|
| + splicer_.SetSpliceTimestamp(kNoTimestamp);
|
| scoped_refptr<AudioBuffer> third_buffer =
|
| GetNextInputBuffer(0.0f, kBufferSize * 10);
|
| third_buffer->set_timestamp(base::TimeDelta());
|
|
|