| 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 37305c3978c65bcb987ec0df2d29fdf60182ff65..2940ab9505715b61767de0e3f20d72e134670ed9 100644
|
| --- a/media/audio/audio_output_controller_unittest.cc
|
| +++ b/media/audio/audio_output_controller_unittest.cc
|
| @@ -53,7 +53,7 @@ class MockAudioOutputControllerSyncReader
|
| MockAudioOutputControllerSyncReader() {}
|
|
|
| MOCK_METHOD1(UpdatePendingBytes, void(uint32 bytes));
|
| - MOCK_METHOD3(Read, int(bool block, const AudioBus* source, AudioBus* dest));
|
| + MOCK_METHOD2(Read, void(const AudioBus* source, AudioBus* dest));
|
| MOCK_METHOD0(Close, void());
|
|
|
| private:
|
| @@ -83,10 +83,10 @@ ACTION_P(SignalEvent, event) {
|
|
|
| static const float kBufferNonZeroData = 1.0f;
|
| ACTION(PopulateBuffer) {
|
| - arg2->Zero();
|
| + arg1->Zero();
|
| // Note: To confirm the buffer will be populated in these tests, it's
|
| // sufficient that only the first float in channel 0 is set to the value.
|
| - arg2->channel(0)[0] = kBufferNonZeroData;
|
| + arg1->channel(0)[0] = kBufferNonZeroData;
|
| }
|
|
|
| class AudioOutputControllerTest : public testing::Test {
|
| @@ -139,10 +139,9 @@ class AudioOutputControllerTest : public testing::Test {
|
| // sent from the render process.
|
| EXPECT_CALL(mock_sync_reader_, UpdatePendingBytes(_))
|
| .Times(AtLeast(1));
|
| - EXPECT_CALL(mock_sync_reader_, Read(_, _, _))
|
| + EXPECT_CALL(mock_sync_reader_, Read(_, _))
|
| .WillRepeatedly(DoAll(PopulateBuffer(),
|
| - SignalEvent(&read_event_),
|
| - Return(params_.frames_per_buffer())));
|
| + SignalEvent(&read_event_)));
|
| controller_->Play();
|
| }
|
|
|
|
|