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

media/base/audio_renderer_sink.h

 // Copyright (c) 2012 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.
 
 #ifndef MEDIA_BASE_AUDIO_RENDERER_SINK_H_
 #define MEDIA_BASE_AUDIO_RENDERER_SINK_H_
 
 #include <stdint.h>
 
 #include <string>
@@ skipping 10 matching lines @@
 // AudioRendererSink is an interface representing the end-point for
 // rendered audio.  An implementation is expected to
 // periodically call Render() on a callback object.
 
 class AudioRendererSink
     : public base::RefCountedThreadSafe<media::AudioRendererSink> {
  public:
   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;
 
    protected:
     virtual ~RenderCallback() {}
   };
 
   // Sets important information about the audio stream format.
   // It must be called before any of the other methods.
   virtual void Initialize(const AudioParameters& params,
@@ skipping 54 matching lines @@
                                   const url::Origin& security_origin,
                                   const OutputDeviceStatusCB& callback) = 0;
 
  protected:
   ~SwitchableAudioRendererSink() override {}
 };
 
 }  // namespace media
 
 #endif  // MEDIA_BASE_AUDIO_RENDERER_SINK_H_