| Index: media/audio/linux/alsa_output_unittest.cc
|
| ===================================================================
|
| --- media/audio/linux/alsa_output_unittest.cc (revision 133451)
|
| +++ media/audio/linux/alsa_output_unittest.cc (working copy)
|
| @@ -69,8 +69,7 @@
|
|
|
| class MockAudioSourceCallback : public AudioOutputStream::AudioSourceCallback {
|
| public:
|
| - MOCK_METHOD4(OnMoreData, uint32(AudioOutputStream* stream,
|
| - uint8* dest, uint32 max_size,
|
| + MOCK_METHOD3(OnMoreData, uint32(uint8* dest, uint32 max_size,
|
| AudioBuffersState buffers_state));
|
| MOCK_METHOD2(OnError, void(AudioOutputStream* stream, int code));
|
| };
|
| @@ -440,8 +439,7 @@
|
| EXPECT_CALL(mock_alsa_wrapper_, PcmDelay(kFakeHandle, _))
|
| .Times(2)
|
| .WillRepeatedly(DoAll(SetArgumentPointee<1>(0), Return(0)));
|
| - EXPECT_CALL(mock_callback,
|
| - OnMoreData(test_stream, _, kTestPacketSize, _))
|
| + EXPECT_CALL(mock_callback, OnMoreData(_, kTestPacketSize, _))
|
| .Times(2)
|
| .WillOnce(Return(kTestPacketSize))
|
| .WillOnce(Return(0));
|
| @@ -559,8 +557,7 @@
|
| .WillRepeatedly(Return(0)); // Buffer is full.
|
|
|
| // Return a partially filled packet.
|
| - EXPECT_CALL(mock_callback,
|
| - OnMoreData(test_stream, _, _, _))
|
| + EXPECT_CALL(mock_callback, OnMoreData(_, _, _))
|
| .WillOnce(Return(10));
|
|
|
| bool source_exhausted;
|
| @@ -586,7 +583,7 @@
|
| .WillOnce(DoAll(SetArgumentPointee<1>(-1), Return(0)));
|
| EXPECT_CALL(mock_alsa_wrapper_, PcmAvailUpdate(_))
|
| .WillRepeatedly(Return(0)); // Buffer is full.
|
| - EXPECT_CALL(mock_callback, OnMoreData(test_stream, _, _, _))
|
| + EXPECT_CALL(mock_callback, OnMoreData(_, _, _))
|
| .WillOnce(Return(10));
|
|
|
| bool source_exhausted;
|
| @@ -611,7 +608,7 @@
|
| EXPECT_CALL(mock_alsa_wrapper_, PcmAvailUpdate(_))
|
| .WillRepeatedly(Return(0)); // Buffer is full.
|
| EXPECT_CALL(mock_callback,
|
| - OnMoreData(test_stream, _, _, AllOf(
|
| + OnMoreData(_, _, AllOf(
|
| Field(&AudioBuffersState::pending_bytes, 0),
|
| Field(&AudioBuffersState::hardware_delay_bytes, 0))))
|
| .WillOnce(Return(10));
|
|
|