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

media/base/audio_renderer_mixer_unittest.cc

Index: media/base/audio_renderer_mixer_unittest.cc
diff --git a/media/base/audio_renderer_mixer_unittest.cc b/media/base/audio_renderer_mixer_unittest.cc
index 36f3cb6863769df5b3923daa2c3e0c22f8070dc2..b773112090d9d485e3f9d56ec15d841d5ed7c85a 100644
--- a/media/base/audio_renderer_mixer_unittest.cc
+++ b/media/base/audio_renderer_mixer_unittest.cc
@@ -163,14 +163,12 @@
     }
 
     // Render actual audio data.
-    int frames = mixer_callback_->Render(
-        base::TimeDelta(), base::TimeTicks::Now(), 0, audio_bus_.get());
+    int frames = mixer_callback_->Render(audio_bus_.get(), 0, 0);
     if (frames != audio_bus_->frames())
       return false;
 
     // Render expected audio data (without scaling).
-    expected_callback_->Render(base::TimeDelta(), base::TimeTicks::Now(), 0,
-                               expected_audio_bus_.get());
+    expected_callback_->Render(expected_audio_bus_.get(), 0, 0);
 
     if (half_fill_) {
       // In this case, just verify that every frame was initialized, this will
@@ -491,8 +489,7 @@
   const base::TimeDelta kSleepTime = base::TimeDelta::FromMilliseconds(100);
   base::TimeTicks start_time = base::TimeTicks::Now();
   while (!pause_event.IsSignaled()) {
-    mixer_callback_->Render(base::TimeDelta(), base::TimeTicks::Now(), 0,
-                            audio_bus_.get());
+    mixer_callback_->Render(audio_bus_.get(), 0, 0);
     base::PlatformThread::Sleep(kSleepTime);
     ASSERT_TRUE(base::TimeTicks::Now() - start_time < kTestTimeout);
   }
@@ -507,8 +504,7 @@
   // Ensure once the input is paused the sink eventually pauses.
   start_time = base::TimeTicks::Now();
   while (!pause_event.IsSignaled()) {
-    mixer_callback_->Render(base::TimeDelta(), base::TimeTicks::Now(), 0,
-                            audio_bus_.get());
+    mixer_callback_->Render(audio_bus_.get(), 0, 0);
     base::PlatformThread::Sleep(kSleepTime);
     ASSERT_TRUE(base::TimeTicks::Now() - start_time < kTestTimeout);
   }