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

media/base/audio_renderer_sink.h

Index: media/base/audio_renderer_sink.h
diff --git a/media/base/audio_renderer_sink.h b/media/base/audio_renderer_sink.h
index 4052112bab555b6703c90962422323f5cbeff0e4..f768b7cb1b42d2f0fbb4d7f192b2df5a1d7840ab 100644
--- a/media/base/audio_renderer_sink.h
+++ b/media/base/audio_renderer_sink.h
@@ -28,15 +28,14 @@
   class RenderCallback {
    public:
     // Attempts to completely fill all channels of |dest|, returns actual
-    // number of frames filled. |prior_frames_skipped| contains the number of
-    // frames
+    // number of frames filled. |frames_skipped| contains the number of frames
     // the consumer has skipped, if any.
-    // The |delay| argument represents audio device output latency,
-    // |delay_timestamp| represents the time when |delay| was obtained.
-    virtual int Render(base::TimeDelta delay,
-                       base::TimeTicks delay_timestamp,
-                       int prior_frames_skipped,
-                       AudioBus* dest) = 0;
+    // TODO(jameswest): Change to use the same signature as
+    // AudioOutputStream::AudioSourceCallback::OnMoreData.
+    virtual int Render(AudioBus* dest,
+                       uint32_t frames_delayed,
+                       uint32_t frames_skipped) = 0;
+
     // Signals an error has occurred.
     virtual void OnRenderError() = 0;