| 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..6c9a161945d55de4f80afd228bf19787f4d64bef 100644
|
| --- a/media/audio/alsa/alsa_output_unittest.cc
|
| +++ b/media/audio/alsa/alsa_output_unittest.cc
|
| @@ -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, AudioTimestamp()))
|
| .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, AudioTimestamp()))
|
| .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, AudioTimestamp()))
|
| .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, 0, AudioTimestamp()))
|
| .WillOnce(DoAll(ClearBuffer(), Return(kTestFramesPerPacket / 2)));
|
|
|
| bool source_exhausted;
|
|
|