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

media/audio/audio_output_device_unittest.cc

Index: media/audio/audio_output_device_unittest.cc
diff --git a/media/audio/audio_output_device_unittest.cc b/media/audio/audio_output_device_unittest.cc
index 70a9b3902b8a4bb4ae0164c4a98aadde174eb33b..cf8be1e9075f3f1ee183e145dcd4f629292c8383 100644
--- a/media/audio/audio_output_device_unittest.cc
+++ b/media/audio/audio_output_device_unittest.cc
@@ -53,10 +53,11 @@ class MockRenderCallback : public AudioRendererSink::RenderCallback {
   MockRenderCallback() {}
   virtual ~MockRenderCallback() {}
 
-  MOCK_METHOD3(Render,
+  MOCK_METHOD4(Render,
                int(AudioBus* dest,
-                   uint32_t frames_delayed,
-                   uint32_t frames_skipped));
+                   base::TimeDelta delay,
+                   base::TimeTicks timestamp,
+                   uint32_t prior_frames_skipped));
   MOCK_METHOD0(OnRenderError, void());
 };
 
@@ -79,8 +80,11 @@ class MockAudioOutputIPC : public AudioOutputIPC {
   MOCK_METHOD1(SetVolume, void(double volume));
 };
 
-ACTION_P2(SendPendingBytes, socket, pending_bytes) {
-  socket->Send(&pending_bytes, sizeof(pending_bytes));
+ACTION_P2(SendPendingData, socket, delay) {
+  const auto delay_timestamp = base::TimeTicks::Now();
+  media::AudioDeviceThread::Packet packet = {delay.ToInternalValue(),
+                                             delay_timestamp.ToInternalValue()};
+  socket->Send(&packet, sizeof(packet));
 }
 
 // Used to terminate a loop from a different thread than the loop belongs to.
@@ -227,10 +231,9 @@ void AudioOutputDeviceTest::ExpectRenderCallback() {
   // Respond by asking for some audio data.  This should ask our callback
   // to provide some audio data that AudioOutputDevice then writes into the
   // shared memory section.
-  const int kMemorySize = CalculateMemorySize();
-
+  const auto delay = base::TimeDelta::FromSeconds(1);
   EXPECT_CALL(*audio_output_ipc_, PlayStream())
-      .WillOnce(SendPendingBytes(&browser_socket_, kMemorySize));
+      .WillOnce(SendPendingData(&browser_socket_, delay));
 
   // We expect calls to our audio renderer callback, which returns the number
   // of frames written to the memory section.
@@ -240,7 +243,7 @@ void AudioOutputDeviceTest::ExpectRenderCallback() {
   // So, for the sake of this test, we consider the call to Render a sign
   // of success and quit the loop.
   const int kNumberOfFramesToProcess = 0;
-  EXPECT_CALL(callback_, Render(_, _, _))
+  EXPECT_CALL(callback_, Render(_, _, _, _))
       .WillOnce(DoAll(QuitLoop(io_loop_.task_runner()),
                       Return(kNumberOfFramesToProcess)));
 }