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

media/base/silent_sink_suspender.h

 // Copyright 2016 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_SILENT_SINK_SUSPENDER_H_
 #define MEDIA_BASE_SILENT_SINK_SUSPENDER_H_
 
 #include <stdint.h>
 
 #include <deque>
@@ skipping 29 matching lines @@
   // amount of silence to allow before suspension is |silence_timeout|.
   SilentSinkSuspender(
       AudioRendererSink::RenderCallback* callback,
       base::TimeDelta silence_timeout,
       const AudioParameters& params,
       const scoped_refptr<AudioRendererSink>& sink,
       const scoped_refptr<base::SingleThreadTaskRunner>& worker);
   ~SilentSinkSuspender() override;
 
   // AudioRendererSink::RenderCallback implementation.
-  int Render(base::TimeDelta delay,
-             base::TimeTicks delay_timestamp,
-             int prior_frames_skipped,
-             AudioBus* dest) override;
+  int Render(AudioBus* dest,
+             uint32_t frames_delayed,
+             uint32_t frames_skipped) override;
   void OnRenderError() override;
 
   bool is_using_fake_sink_for_testing() const { return is_using_fake_sink_; }
 
  private:
   // If |use_fake_sink| is true, pauses |sink_| and plays |fake_sink_|; if
   // false, pauses |fake_sink_| and plays |sink_|.
   void TransitionSinks(bool use_fake_sink);
 
   // Actual RenderCallback providing audio data to the output device.
@@ skipping 38 matching lines @@
   // after a period of silence or first non-silent audio respective. We do this
   // on Android to save battery consumption.
   base::CancelableCallback<void(bool)> sink_transition_callback_;
 
   DISALLOW_COPY_AND_ASSIGN(SilentSinkSuspender);
 };
 
 }  // namespace content
 
 #endif  // MEDIA_BASE_SILENT_SINK_SUSPENDER_H_