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 a7118e17a3052ace9260dc73be8ec29cec6a1fc6..b61d12e46761d5a867e91e726d7048ddf66419c1 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 { |
@@ -141,10 +141,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(); |
} |