Reland: Make more media APIs aware of |delay| and |delay_timestamp|

content/renderer/media/webrtc_audio_renderer.h

Index: content/renderer/media/webrtc_audio_renderer.h
diff --git a/content/renderer/media/webrtc_audio_renderer.h b/content/renderer/media/webrtc_audio_renderer.h
index 3c4d22a11b96745c3995b960afa279a3b565ab03..1da6863cb2062447c10119f94712a229b24c9e70 100644
--- a/content/renderer/media/webrtc_audio_renderer.h
+++ b/content/renderer/media/webrtc_audio_renderer.h
@@ -160,9 +160,10 @@ class CONTENT_EXPORT WebRtcAudioRenderer
 
   // media::AudioRendererSink::RenderCallback implementation.
   // These two methods are called on the AudioOutputDevice worker thread.
-  int Render(media::AudioBus* audio_bus,
-             uint32_t frames_delayed,
-             uint32_t frames_skipped) override;
+  int Render(base::TimeDelta delay,
+             base::TimeTicks delay_timestamp,
+             int prior_frames_skipped,
+             media::AudioBus* audio_bus) override;
   void OnRenderError() override;
 
   // Called by AudioPullFifo when more data is necessary.
@@ -228,7 +229,7 @@ class CONTENT_EXPORT WebRtcAudioRenderer
 
   // Contains the accumulated delay estimate which is provided to the WebRTC
   // AEC.
-  int audio_delay_milliseconds_;
+  base::TimeDelta audio_delay_;
 
   base::TimeDelta current_time_;