Revert of Make more media APIs aware of |delay| and |delay_timestamp|

media/audio/audio_output_stream_sink.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "media/audio/audio_output_stream_sink.h"
 
 #include <algorithm>
 #include <cmath>
 
 #include "base/bind.h"
@@ skipping 67 matching lines @@
 OutputDeviceInfo AudioOutputStreamSink::GetOutputDeviceInfo() {
   return OutputDeviceInfo();
 }
 
 bool AudioOutputStreamSink::CurrentThreadIsRenderingThread() {
   NOTIMPLEMENTED();
   return false;
 }
 
 int AudioOutputStreamSink::OnMoreData(base::TimeDelta delay,
-                                      base::TimeTicks delay_timestamp,
+                                      base::TimeTicks /* delay_timestamp */,
                                       int prior_frames_skipped,
                                       AudioBus* dest) {
   // Note: Runs on the audio thread created by the OS.
   base::AutoLock al(callback_lock_);
   if (!active_render_callback_)
     return 0;
 
-  return active_render_callback_->Render(delay, delay_timestamp,
-                                         prior_frames_skipped, dest);
+  uint32_t frames_delayed =
+      AudioTimestampHelper::TimeToFrames(delay, active_params_.sample_rate());
+
+  return active_render_callback_->Render(dest, frames_delayed,
+                                         prior_frames_skipped);
 }
 
 void AudioOutputStreamSink::OnError(AudioOutputStream* stream) {
   // Note: Runs on the audio thread created by the OS.
   base::AutoLock al(callback_lock_);
   if (active_render_callback_)
     active_render_callback_->OnRenderError();
 }
 
 void AudioOutputStreamSink::DoStart(const AudioParameters& params) {
@@ skipping 41 matching lines @@
   DCHECK(audio_task_runner_->BelongsToCurrentThread());
   stream_->SetVolume(volume);
 }
 
 void AudioOutputStreamSink::ClearCallback() {
   base::AutoLock al(callback_lock_);
   active_render_callback_ = NULL;
 }
 
 }  // namespace media