Reland: 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..681de252410a7f232ccd4b0a31c2f9be020a41f3 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,
-               int(AudioBus* dest,
-                   uint32_t frames_delayed,
-                   uint32_t frames_skipped));
+  MOCK_METHOD4(Render,
+               int(base::TimeDelta delay,
+                   base::TimeTicks timestamp,
+                   int prior_frames_skipped,
+                   AudioBus* dest));
   MOCK_METHOD0(OnRenderError, void());
 };
 
@@ -228,7 +229,6 @@ void AudioOutputDeviceTest::ExpectRenderCallback() {
   // to provide some audio data that AudioOutputDevice then writes into the
   // shared memory section.
   const int kMemorySize = CalculateMemorySize();
-
   EXPECT_CALL(*audio_output_ipc_, PlayStream())
       .WillOnce(SendPendingBytes(&browser_socket_, kMemorySize));

[chcunningham, 2016/11/22 17:36:58]

I might be missing something... this seems like it doesn't match the new
convention of just sending a control signal (typically zero) and sending pending
delay separately via shared memory. If so, this test is probably not making
strong enough verifications that control signal and delay values are reasonable.

[Mikhail, 2016/11/23 15:26:01]

The existing test did not check 'Render' arguments, this check is added in the
latest patch set.

 
@@ -240,7 +240,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)));
 }