Index: media/base/audio_discard_helper_unittest.cc |
diff --git a/media/base/audio_discard_helper_unittest.cc b/media/base/audio_discard_helper_unittest.cc |
index 3763b84004199826973e39b332f1443d2ec94471..f836fa965bdadebc2f91049aff10482cc79e756d 100644 |
--- a/media/base/audio_discard_helper_unittest.cc |
+++ b/media/base/audio_discard_helper_unittest.cc |
@@ -30,14 +30,8 @@ static scoped_refptr<DecoderBuffer> CreateEncodedBuffer( |
} |
static scoped_refptr<AudioBuffer> CreateDecodedBuffer(int frames) { |
- return MakeAudioBuffer(kSampleFormatPlanarF32, |
- CHANNEL_LAYOUT_MONO, |
- 1, |
- kSampleRate, |
- 0.0f, |
- kDataStep, |
- frames, |
- kNoTimestamp()); |
+ return MakeAudioBuffer(kSampleFormatPlanarF32, CHANNEL_LAYOUT_MONO, 1, |
+ kSampleRate, 0.0f, kDataStep, frames, kNoTimestamp); |
} |
static float ExtractDecodedData(const scoped_refptr<AudioBuffer>& buffer, |
@@ -468,7 +462,7 @@ TEST(AudioDiscardHelperTest, CompleteDiscard) { |
scoped_refptr<DecoderBuffer> encoded_buffer = |
CreateEncodedBuffer(kTimestamp, kDuration); |
encoded_buffer->set_discard_padding( |
- std::make_pair(kInfiniteDuration(), base::TimeDelta())); |
+ std::make_pair(kInfiniteDuration, base::TimeDelta())); |
scoped_refptr<AudioBuffer> decoded_buffer = CreateDecodedBuffer(kTestFrames); |
// Verify all of the first buffer is discarded. |
@@ -498,7 +492,7 @@ TEST(AudioDiscardHelperTest, CompleteDiscardWithDelayedDiscard) { |
scoped_refptr<DecoderBuffer> encoded_buffer = |
CreateEncodedBuffer(kTimestamp, kDuration); |
encoded_buffer->set_discard_padding( |
- std::make_pair(kInfiniteDuration(), base::TimeDelta())); |
+ std::make_pair(kInfiniteDuration, base::TimeDelta())); |
scoped_refptr<AudioBuffer> decoded_buffer = CreateDecodedBuffer(kTestFrames); |
// Setup a delayed discard. |
@@ -534,7 +528,7 @@ TEST(AudioDiscardHelperTest, CompleteDiscardWithInitialDiscardDecoderDelay) { |
scoped_refptr<DecoderBuffer> encoded_buffer = |
CreateEncodedBuffer(kTimestamp, kDuration); |
encoded_buffer->set_discard_padding( |
- std::make_pair(kInfiniteDuration(), base::TimeDelta())); |
+ std::make_pair(kInfiniteDuration, base::TimeDelta())); |
scoped_refptr<AudioBuffer> decoded_buffer = CreateDecodedBuffer(kTestFrames); |
// Verify all of the first buffer is discarded. |