| Index: media/audio/audio_output_controller_unittest.cc
|
| diff --git a/media/audio/audio_output_controller_unittest.cc b/media/audio/audio_output_controller_unittest.cc
|
| index b0133f280a5fe866a5999da32ddacde99d605984..332d82f89208203d89cd68abbe36d520bb11f8d8 100644
|
| --- a/media/audio/audio_output_controller_unittest.cc
|
| +++ b/media/audio/audio_output_controller_unittest.cc
|
| @@ -60,8 +60,10 @@ class MockAudioOutputControllerSyncReader
|
| public:
|
| MockAudioOutputControllerSyncReader() {}
|
|
|
| - MOCK_METHOD2(UpdatePendingBytes,
|
| - void(uint32_t bytes, uint32_t frames_skipped));
|
| + MOCK_METHOD3(UpdatePendingBytes,
|
| + void(uint32_t bytes,
|
| + uint32_t frames_skipped,
|
| + const media::AudioTimestamp& timestamp));
|
| MOCK_METHOD1(Read, void(AudioBus* dest));
|
| MOCK_METHOD0(Close, void());
|
|
|
| @@ -140,7 +142,8 @@ class AudioOutputControllerTest : public testing::Test {
|
|
|
| // During playback, the mock pretends to provide audio data rendered and
|
| // sent from the render process.
|
| - EXPECT_CALL(mock_sync_reader_, UpdatePendingBytes(_, _)).Times(AtLeast(1));
|
| + EXPECT_CALL(mock_sync_reader_, UpdatePendingBytes(_, _, AudioTimestamp()))
|
| + .Times(AtLeast(1));
|
| EXPECT_CALL(mock_sync_reader_, Read(_)).WillRepeatedly(PopulateBuffer());
|
| controller_->Play();
|
| base::RunLoop().RunUntilIdle();
|
| @@ -213,7 +216,8 @@ class AudioOutputControllerTest : public testing::Test {
|
| std::unique_ptr<AudioBus> dest = AudioBus::Create(params_);
|
|
|
| // It is this OnMoreData() call that triggers |sink|'s OnData().
|
| - const int frames_read = controller_->OnMoreData(dest.get(), 0, 0);
|
| + const int frames_read =
|
| + controller_->OnMoreData(dest.get(), 0, 0, AudioTimestamp());
|
|
|
| EXPECT_LT(0, frames_read);
|
| EXPECT_EQ(kBufferNonZeroData, dest->channel(0)[0]);
|
|
|