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

media/base/audio_renderer_mixer_unittest.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 "media/base/audio_renderer_mixer.h"
 
 #include <stddef.h>
@@ skipping 145 matching lines @@
     if (half_fill_) {
       for (size_t i = 0; i < fake_callbacks_.size(); ++i)
         fake_callbacks_[i]->set_half_fill(true);
       expected_callback_->set_half_fill(true);
       // Initialize the AudioBus completely or we'll run into Valgrind problems
       // during the verification step below.
       expected_audio_bus_->Zero();
     }
 
     // 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
       // only fail under tooling such as valgrind.
       return ValidateAudioData(
           0, frames, 0, std::numeric_limits<double>::max());
     } else {
       return ValidateAudioData(0, frames, scale);
     }
   }
@@ skipping 300 matching lines @@
       base::WaitableEvent::ResetPolicy::MANUAL,
       base::WaitableEvent::InitialState::NOT_SIGNALED);
   EXPECT_CALL(*sink_.get(), Pause()).Times(2)
       .WillRepeatedly(SignalEvent(&pause_event));
   InitializeInputs(1);
 
   // Ensure never playing the input results in a sink pause.
   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);
   }
   pause_event.Reset();
 
   // Playing the input for the first time should cause a sink play.
   mixer_inputs_[0]->Start();
   EXPECT_CALL(*sink_.get(), Play());
   mixer_inputs_[0]->Play();
   mixer_inputs_[0]->Pause();
 
   // 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);
   }
 
   mixer_inputs_[0]->Stop();
 }
 
 INSTANTIATE_TEST_CASE_P(
     AudioRendererMixerTest,
     AudioRendererMixerTest,
@@ skipping 31 matching lines @@
 INSTANTIATE_TEST_CASE_P(
     AudioRendererMixerBehavioralTest,
     AudioRendererMixerBehavioralTest,
     testing::ValuesIn(std::vector<AudioRendererMixerTestData>(
         1,
         std::tr1::make_tuple(&kTestInputLower,
                              1,
                              kTestInputLower,
                              0.00000048))));
 }  // namespace media