summaryrefslogtreecommitdiffstats
path: root/media/audio/audio_output_controller_unittest.cc
diff options
context:
space:
mode:
Diffstat (limited to 'media/audio/audio_output_controller_unittest.cc')
-rw-r--r--media/audio/audio_output_controller_unittest.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/media/audio/audio_output_controller_unittest.cc b/media/audio/audio_output_controller_unittest.cc
index b68dea2..9addca8 100644
--- a/media/audio/audio_output_controller_unittest.cc
+++ b/media/audio/audio_output_controller_unittest.cc
@@ -51,7 +51,8 @@ class MockAudioOutputControllerSyncReader
public:
MockAudioOutputControllerSyncReader() {}
- MOCK_METHOD1(UpdatePendingBytes, void(uint32 bytes));
+ MOCK_METHOD2(UpdatePendingBytes,
+ void(uint32_t bytes, uint32_t frames_skipped));
MOCK_METHOD1(Read, void(AudioBus* dest));
MOCK_METHOD0(Close, void());
@@ -132,8 +133,7 @@ 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(_, _)).Times(AtLeast(1));
EXPECT_CALL(mock_sync_reader_, Read(_))
.WillRepeatedly(DoAll(PopulateBuffer(),
SignalEvent(&read_event_)));
@@ -190,7 +190,7 @@ class AudioOutputControllerTest : public testing::Test {
scoped_ptr<AudioBus> dest = AudioBus::Create(params_);
ASSERT_TRUE(mock_stream_.callback());
const int frames_read =
- mock_stream_.callback()->OnMoreData(dest.get(), 0);
+ mock_stream_.callback()->OnMoreData(dest.get(), 0, 0);
EXPECT_LT(0, frames_read);
EXPECT_EQ(kBufferNonZeroData, dest->channel(0)[0]);
}