| Index: media/renderers/audio_renderer_impl_unittest.cc
|
| diff --git a/media/renderers/audio_renderer_impl_unittest.cc b/media/renderers/audio_renderer_impl_unittest.cc
|
| index 5f4a0d5a64a0b1ce4ec5cfdf885df69dea044e8e..671787aea6b587ef8d179cfa5ce2d6883d102270 100644
|
| --- a/media/renderers/audio_renderer_impl_unittest.cc
|
| +++ b/media/renderers/audio_renderer_impl_unittest.cc
|
| @@ -132,6 +132,8 @@ class AudioRendererImplTest : public ::testing::Test, public RendererClient {
|
| MOCK_METHOD0(OnWaitingForDecryptionKey, void(void));
|
| MOCK_METHOD1(OnVideoNaturalSizeChange, void(const gfx::Size&));
|
| MOCK_METHOD1(OnVideoOpacityChange, void(bool));
|
| + MOCK_METHOD3(OnTimeUpdate,
|
| + void(base::TimeDelta, base::TimeDelta, base::TimeTicks));
|
|
|
| void InitializeRenderer(const PipelineStatusCB& pipeline_status_cb) {
|
| EXPECT_CALL(*this, OnWaitingForDecryptionKey()).Times(0);
|
| @@ -359,7 +361,7 @@ class AudioRendererImplTest : public ::testing::Test, public RendererClient {
|
| }
|
|
|
| base::TimeDelta CurrentMediaTime() {
|
| - return renderer_->CurrentMediaTime();
|
| + return renderer_->CurrentMediaTime(nullptr);
|
| }
|
|
|
| bool ended() const { return ended_; }
|
| @@ -913,7 +915,8 @@ TEST_F(AudioRendererImplTest, TimeSourceBehavior) {
|
|
|
| // Store current media time before advancing the tick clock since the call is
|
| // compensated based on TimeTicks::Now().
|
| - const base::TimeDelta current_media_time = renderer_->CurrentMediaTime();
|
| + const base::TimeDelta current_media_time =
|
| + renderer_->CurrentMediaTime(nullptr);
|
|
|
| // The current wall clock time should change as our tick clock advances, up
|
| // until we've reached the end of played out frames.
|
| @@ -965,16 +968,17 @@ TEST_F(AudioRendererImplTest, TimeSourceBehavior) {
|
| current_time = tick_clock_->NowTicks() + delay_time;
|
| EXPECT_EQ(current_time, CurrentMediaWallClockTime(&is_time_moving));
|
| EXPECT_TRUE(is_time_moving);
|
| - EXPECT_EQ(current_time,
|
| - ConvertMediaTime(renderer_->CurrentMediaTime(), &is_time_moving));
|
| + EXPECT_EQ(current_time, ConvertMediaTime(renderer_->CurrentMediaTime(nullptr),
|
| + &is_time_moving));
|
| EXPECT_TRUE(is_time_moving);
|
|
|
| tick_clock_->Advance(kOneSample);
|
| renderer_->SetPlaybackRate(2);
|
| EXPECT_EQ(current_time, CurrentMediaWallClockTime(&is_time_moving));
|
| EXPECT_TRUE(is_time_moving);
|
| - EXPECT_EQ(current_time + kOneSample * 2,
|
| - ConvertMediaTime(renderer_->CurrentMediaTime(), &is_time_moving));
|
| + EXPECT_EQ(
|
| + current_time + kOneSample * 2,
|
| + ConvertMediaTime(renderer_->CurrentMediaTime(nullptr), &is_time_moving));
|
| EXPECT_TRUE(is_time_moving);
|
|
|
| // Advance far enough that we shouldn't be clamped to current time (tested
|
|
|