Index: media/audio/audio_output_device_unittest.cc |
diff --git a/media/audio/audio_output_device_unittest.cc b/media/audio/audio_output_device_unittest.cc |
index aa7e649d1fa28f5e00c7645d81d03a292a11e293..5faa119a635294dbe873622f0db02bb89d0e8f61 100644 |
--- a/media/audio/audio_output_device_unittest.cc |
+++ b/media/audio/audio_output_device_unittest.cc |
@@ -44,10 +44,7 @@ |
MockRenderCallback() {} |
virtual ~MockRenderCallback() {} |
- MOCK_METHOD3(Render, |
- int(AudioBus* dest, |
- uint32_t audio_delay_milliseconds, |
- uint32_t frames_skipped)); |
+ MOCK_METHOD2(Render, int(AudioBus* dest, int audio_delay_milliseconds)); |
MOCK_METHOD0(OnRenderError, void()); |
}; |
@@ -120,8 +117,7 @@ |
int AudioOutputDeviceTest::CalculateMemorySize() { |
// Calculate output memory size. |
- return sizeof(AudioOutputBufferParameters) + |
- AudioBus::CalculateMemorySize(default_audio_parameters_); |
+ return AudioBus::CalculateMemorySize(default_audio_parameters_); |
} |
AudioOutputDeviceTest::AudioOutputDeviceTest() |
@@ -218,9 +214,10 @@ |
// So, for the sake of this test, we consider the call to Render a sign |
// of success and quit the loop. |
const int kNumberOfFramesToProcess = 0; |
- EXPECT_CALL(callback_, Render(_, _, _)) |
- .WillOnce(DoAll(QuitLoop(io_loop_.task_runner()), |
- Return(kNumberOfFramesToProcess))); |
+ EXPECT_CALL(callback_, Render(_, _)) |
+ .WillOnce(DoAll( |
+ QuitLoop(io_loop_.task_runner()), |
+ Return(kNumberOfFramesToProcess))); |
} |
void AudioOutputDeviceTest::WaitUntilRenderCallback() { |