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

media/base/fake_audio_render_callback.cc

 // 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.
 
 // MSVC++ requires this to be set before any other includes to get M_PI.
 #define _USE_MATH_DEFINES
 
 #include <cmath>
 
-#include "media/base/audio_timestamp_helper.h"
 #include "media/base/fake_audio_render_callback.h"
 
 namespace media {
 
 FakeAudioRenderCallback::FakeAudioRenderCallback(double step)
     : half_fill_(false),
       step_(step),
       last_frames_delayed_(-1),
       last_channel_count_(-1),
       volume_(1) {
   reset();
 }
 
 FakeAudioRenderCallback::~FakeAudioRenderCallback() {}
 
-int FakeAudioRenderCallback::Render(base::TimeDelta delay,
-                                    base::TimeTicks delay_timestamp,
-                                    int prior_frames_skipped,
-                                    AudioBus* audio_bus) {
-  const int kSampleRate = 48000;
-  auto frames_delayed = AudioTimestampHelper::TimeToFrames(delay, kSampleRate);
+int FakeAudioRenderCallback::Render(AudioBus* audio_bus,
+                                    uint32_t frames_delayed,
+                                    uint32_t frames_skipped) {
   return RenderInternal(audio_bus, frames_delayed, volume_);
 }
 
 double FakeAudioRenderCallback::ProvideInput(AudioBus* audio_bus,
                                              uint32_t frames_delayed) {
   // Volume should only be applied by the caller to ProvideInput, so don't bake
   // it into the rendered audio.
   RenderInternal(audio_bus, frames_delayed, 1.0);
   return volume_;
 }
@@ skipping 17 matching lines @@
   // Copy first channel into the rest of the channels.
   for (int i = 1; i < audio_bus->channels(); ++i) {
     memcpy(audio_bus->channel(i), audio_bus->channel(0),
            number_of_frames * sizeof(*audio_bus->channel(i)));
   }
 
   return number_of_frames;
 }
 
 }  // namespace media