Index: media/audio/audio_output_controller.cc |
diff --git a/media/audio/audio_output_controller.cc b/media/audio/audio_output_controller.cc |
index 4dafadca4eee39d711cb07aec4ebe0fe20a2413b..146cc3d33459420b069f35b91374114f6eaa2535 100644 |
--- a/media/audio/audio_output_controller.cc |
+++ b/media/audio/audio_output_controller.cc |
@@ -295,13 +295,7 @@ void AudioOutputController::DoReportError() { |
int AudioOutputController::OnMoreData(AudioBus* dest, |
AudioBuffersState buffers_state) { |
- return OnMoreIOData(NULL, dest, buffers_state); |
-} |
- |
-int AudioOutputController::OnMoreIOData(AudioBus* source, |
- AudioBus* dest, |
- AudioBuffersState buffers_state) { |
- TRACE_EVENT0("audio", "AudioOutputController::OnMoreIOData"); |
+ TRACE_EVENT0("audio", "AudioOutputController::OnMoreData"); |
// Indicate that we haven't wedged (at least not indefinitely, WedgeCheck() |
// may have already fired if OnMoreIOData() took an abnormal amount of time). |
@@ -310,7 +304,7 @@ int AudioOutputController::OnMoreIOData(AudioBus* source, |
if (base::AtomicRefCountIsZero(&on_more_io_data_called_)) |
base::AtomicRefCountInc(&on_more_io_data_called_); |
- sync_reader_->Read(source, dest); |
+ sync_reader_->Read(dest); |
const int frames = dest->frames(); |
sync_reader_->UpdatePendingBytes( |