Pass delay and timestamp to AudioSourceCallback::OnMoreData.

media/audio/alsa/alsa_output_unittest.cc

Index: media/audio/alsa/alsa_output_unittest.cc
diff --git a/media/audio/alsa/alsa_output_unittest.cc b/media/audio/alsa/alsa_output_unittest.cc
index ce66804bf80c2c3d787d505545133d69bb737d63..e7fb07dfff91428f0d6f7cebb8e86afa35a4c105 100644
--- a/media/audio/alsa/alsa_output_unittest.cc
+++ b/media/audio/alsa/alsa_output_unittest.cc
@@ -215,7 +215,7 @@ char AlsaPcmOutputStreamTest::kGenericSurround50[] = "surround50";
 
 // Custom action to clear a memory buffer.
 ACTION(ClearBuffer) {
-  arg0->Zero();
+  arg2->Zero();
 }
 
 TEST_F(AlsaPcmOutputStreamTest, ConstructedState) {
@@ -432,7 +432,7 @@ TEST_F(AlsaPcmOutputStreamTest, StartStop) {
       .WillRepeatedly(Return(SND_PCM_STATE_RUNNING));
   EXPECT_CALL(mock_alsa_wrapper_, PcmDelay(kFakeHandle, _))
       .WillRepeatedly(DoAll(SetArgumentPointee<1>(0), Return(0)));
-  EXPECT_CALL(mock_callback, OnMoreData(_, _, 0))
+  EXPECT_CALL(mock_callback, OnMoreData(_, 0, _))
       .WillRepeatedly(DoAll(ClearBuffer(), Return(kTestFramesPerPacket)));
   EXPECT_CALL(mock_alsa_wrapper_, PcmWritei(kFakeHandle, _, _))
       .WillRepeatedly(Return(kTestFramesPerPacket));
@@ -595,7 +595,7 @@ TEST_F(AlsaPcmOutputStreamTest, BufferPacket) {
       .WillRepeatedly(Return(0));  // Buffer is full.
 
   // Return a partially filled packet.
-  EXPECT_CALL(mock_callback, OnMoreData(_, _, 0))
+  EXPECT_CALL(mock_callback, OnMoreData(_, 0, _))

[chcunningham, 2016/07/29 01:21:08]

Here they're setting the PcmDelay out argument to 0, so target_playout_time be
roughly equal to Now. Not sure if there's a good way to expect that things are
roughly equal though...

[jameswest, 2016/08/26 02:08:47]

Done.

       .WillOnce(DoAll(ClearBuffer(), Return(kTestFramesPerPacket / 2)));
 
   bool source_exhausted;
@@ -621,7 +621,7 @@ TEST_F(AlsaPcmOutputStreamTest, BufferPacket_Negative) {
       .WillOnce(DoAll(SetArgumentPointee<1>(-1), Return(0)));
   EXPECT_CALL(mock_alsa_wrapper_, PcmAvailUpdate(_))
       .WillRepeatedly(Return(0));  // Buffer is full.
-  EXPECT_CALL(mock_callback, OnMoreData(_, _, 0))
+  EXPECT_CALL(mock_callback, OnMoreData(_, 0, _))

[chcunningham, 2016/07/29 01:21:08]

This target playout time should also roughly equal Ticks::Now

[jameswest, 2016/08/26 02:08:47]

Done.

       .WillOnce(DoAll(ClearBuffer(), Return(kTestFramesPerPacket / 2)));
 
   bool source_exhausted;
@@ -645,7 +645,7 @@ TEST_F(AlsaPcmOutputStreamTest, BufferPacket_Underrun) {
       .WillOnce(Return(SND_PCM_STATE_XRUN));
   EXPECT_CALL(mock_alsa_wrapper_, PcmAvailUpdate(_))
       .WillRepeatedly(Return(0));  // Buffer is full.
-  EXPECT_CALL(mock_callback, OnMoreData(_, 0, 0))
+  EXPECT_CALL(mock_callback, OnMoreData(_, 0, _))

[chcunningham, 2016/07/29 01:21:08]

Its weird that this one was ever 0 - IIUC they aren't setting the PcmDelay
expectation for this method to SetARgumentPointee<1>(0) as they do in the
StartStop case. I think its fine to ignore the delay value here...

[jameswest, 2016/08/26 02:08:47]

It doesn't call PcmDelay because PcmState returns SND_PCM_STATE_XRUN, which
results in the delay returned by GetCurrentDelay being 0.

[chcunningham1, 2016/08/27 00:35:00]

Acknowledged.

       .WillOnce(DoAll(ClearBuffer(), Return(kTestFramesPerPacket / 2)));
 
   bool source_exhausted;