| Index: media/audio/linux/cras_output_unittest.cc
|
| diff --git a/media/audio/linux/cras_output_unittest.cc b/media/audio/linux/cras_output_unittest.cc
|
| index af56ec42291c80020e46b8aec82da0cd7e82e377..a54437a36ac0bf43ca0b6b7a89372b2a50e2ecf3 100644
|
| --- a/media/audio/linux/cras_output_unittest.cc
|
| +++ b/media/audio/linux/cras_output_unittest.cc
|
| @@ -19,8 +19,8 @@ namespace media {
|
|
|
| class MockAudioSourceCallback : public AudioOutputStream::AudioSourceCallback {
|
| public:
|
| - MOCK_METHOD3(OnMoreData, uint32(uint8* dest, uint32 max_size,
|
| - AudioBuffersState buffers_state));
|
| + MOCK_METHOD2(OnMoreData, int(AudioBus* audio_bus,
|
| + AudioBuffersState buffers_state));
|
| MOCK_METHOD2(OnError, void(AudioOutputStream* stream, int code));
|
| };
|
|
|
| @@ -193,16 +193,14 @@ TEST_F(CrasOutputStreamTest, StartStop) {
|
| TEST_F(CrasOutputStreamTest, RenderFrames) {
|
| CrasOutputStream* test_stream = CreateStream(CHANNEL_LAYOUT_MONO);
|
| MockAudioSourceCallback mock_callback;
|
| - const uint32 amount_rendered_return = 2048;
|
|
|
| // Open the stream.
|
| ASSERT_TRUE(test_stream->Open());
|
| EXPECT_EQ(CrasOutputStream::kIsOpened, test_stream->state());
|
|
|
| // Render Callback.
|
| - EXPECT_CALL(mock_callback, OnMoreData(_,
|
| - kTestFramesPerPacket * kTestBytesPerFrame, _))
|
| - .WillRepeatedly(Return(amount_rendered_return));
|
| + EXPECT_CALL(mock_callback, OnMoreData(_, _))
|
| + .WillRepeatedly(Return(kTestFramesPerPacket));
|
|
|
| // Start.
|
| test_stream->Start(&mock_callback);
|
|
|