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

media/base/audio_converter_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_converter.h"
 
 #include <stddef.h>
@@ skipping 97 matching lines @@
     return true;
   }
 
   // Runs a single Convert() stage, fills |expected_audio_bus_| appropriately,
   // and validates equality with |audio_bus_| after |scale| is applied.
   bool RenderAndValidateAudioData(float scale) {
     // Render actual audio data.
     converter_->Convert(audio_bus_.get());
 
     // Render expected audio data.
-    expected_callback_->Render(base::TimeDelta(), base::TimeTicks::Now(), 0,
-                               expected_audio_bus_.get());
+    expected_callback_->Render(expected_audio_bus_.get(), 0, 0);
 
     // Zero out unused channels in the expected AudioBus just as AudioConverter
     // would during channel mixing.
     for (int i = input_parameters_.channels();
          i < output_parameters_.channels(); ++i) {
       memset(expected_audio_bus_->channel(i), 0,
              audio_bus_->frames() * sizeof(*audio_bus_->channel(i)));
     }
 
     return ValidateAudioData(0, audio_bus_->frames(), scale);
@@ skipping 129 matching lines @@
         // No resampling. No channel mixing.
         std::tr1::make_tuple(44100, 44100, CHANNEL_LAYOUT_STEREO, 0.00000048),
 
         // Upsampling. Channel upmixing.
         std::tr1::make_tuple(44100, 48000, CHANNEL_LAYOUT_QUAD, 0.033),
 
         // Downsampling. Channel downmixing.
         std::tr1::make_tuple(48000, 41000, CHANNEL_LAYOUT_MONO, 0.042)));
 
 }  // namespace media