| Index: media/audio/audio_output_controller_unittest.cc
|
| ===================================================================
|
| --- media/audio/audio_output_controller_unittest.cc (revision 156123)
|
| +++ media/audio/audio_output_controller_unittest.cc (working copy)
|
| @@ -52,7 +52,7 @@
|
| MockAudioOutputControllerSyncReader() {}
|
|
|
| MOCK_METHOD1(UpdatePendingBytes, void(uint32 bytes));
|
| - MOCK_METHOD1(Read, int(AudioBus* audio_bus));
|
| + MOCK_METHOD2(Read, int(AudioBus* source, AudioBus* dest));
|
| MOCK_METHOD0(Close, void());
|
| MOCK_METHOD0(DataReady, bool());
|
|
|
| @@ -66,7 +66,7 @@
|
|
|
| // Custom action to clear a memory buffer.
|
| ACTION(ClearBuffer) {
|
| - arg0->Zero();
|
| + arg1->Zero();
|
| }
|
|
|
| // Closes AudioOutputController synchronously.
|
| @@ -130,7 +130,7 @@
|
| MockAudioOutputControllerSyncReader sync_reader;
|
| EXPECT_CALL(sync_reader, UpdatePendingBytes(_))
|
| .Times(AtLeast(2));
|
| - EXPECT_CALL(sync_reader, Read(_))
|
| + EXPECT_CALL(sync_reader, Read(_, _))
|
| .WillRepeatedly(DoAll(ClearBuffer(), SignalEvent(&event),
|
| Return(4)));
|
| EXPECT_CALL(sync_reader, DataReady())
|
| @@ -202,7 +202,7 @@
|
| MockAudioOutputControllerSyncReader sync_reader;
|
| EXPECT_CALL(sync_reader, UpdatePendingBytes(_))
|
| .Times(AtLeast(1));
|
| - EXPECT_CALL(sync_reader, Read(_))
|
| + EXPECT_CALL(sync_reader, Read(_, _))
|
| .WillRepeatedly(DoAll(ClearBuffer(), SignalEvent(&event), Return(4)));
|
| EXPECT_CALL(sync_reader, DataReady())
|
| .WillRepeatedly(Return(true));
|
|
|