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

media/base/audio_renderer_mixer.cc

Index: media/base/audio_renderer_mixer.cc
diff --git a/media/base/audio_renderer_mixer.cc b/media/base/audio_renderer_mixer.cc
index 80d32b027056dc5bc339b42883d0ff84137bda11..b61a04a766eec5504206e05994566473f9e12a60 100644
--- a/media/base/audio_renderer_mixer.cc
+++ b/media/base/audio_renderer_mixer.cc
@@ -12,7 +12,6 @@
 #include "base/memory/ptr_util.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/trace_event/trace_event.h"
-#include "media/base/audio_timestamp_helper.h"
 
 namespace media {
 
@@ -163,10 +162,9 @@
   return audio_sink_->CurrentThreadIsRenderingThread();
 }
 
-int AudioRendererMixer::Render(base::TimeDelta delay,
-                               base::TimeTicks delay_timestamp,
-                               int prior_frames_skipped,
-                               AudioBus* audio_bus) {
+int AudioRendererMixer::Render(AudioBus* audio_bus,
+                               uint32_t frames_delayed,
+                               uint32_t frames_skipped) {
   TRACE_EVENT0("audio", "AudioRendererMixer::Render");
   base::AutoLock auto_lock(lock_);
 
@@ -181,8 +179,6 @@
     playing_ = false;
   }
 
-  uint32_t frames_delayed =
-      AudioTimestampHelper::TimeToFrames(delay, output_params_.sample_rate());
   master_converter_.ConvertWithDelay(frames_delayed, audio_bus);
   return audio_bus->frames();
 }