| Index: media/audio/android/audio_android_unittest.cc
|
| diff --git a/media/audio/android/audio_android_unittest.cc b/media/audio/android/audio_android_unittest.cc
|
| index d5ca8c9163a79f937ce92fe63776df6eb58eb751..e9b5bf8ca6222ccb04673b8b9e2052c016bfdd54 100644
|
| --- a/media/audio/android/audio_android_unittest.cc
|
| +++ b/media/audio/android/audio_android_unittest.cc
|
| @@ -158,10 +158,11 @@ std::ostream& operator<<(std::ostream& os, const AudioParameters& params) {
|
| // Gmock implementation of AudioInputStream::AudioInputCallback.
|
| class MockAudioInputCallback : public AudioInputStream::AudioInputCallback {
|
| public:
|
| - MOCK_METHOD4(OnData,
|
| + MOCK_METHOD5(OnData,
|
| void(AudioInputStream* stream,
|
| const AudioBus* src,
|
| - uint32_t hardware_delay_bytes,
|
| + base::TimeDelta delay,
|
| + base::TimeTicks delay_timestamp,
|
| double volume));
|
| MOCK_METHOD1(OnError, void(AudioInputStream* stream));
|
| };
|
| @@ -275,7 +276,8 @@ class FileAudioSink : public AudioInputStream::AudioInputCallback {
|
| // AudioInputStream::AudioInputCallback implementation.
|
| void OnData(AudioInputStream* stream,
|
| const AudioBus* src,
|
| - uint32_t hardware_delay_bytes,
|
| + base::TimeDelta delay,
|
| + base::TimeTicks delay_timestamp,
|
| double volume) override {
|
| const int num_samples = src->frames() * src->channels();
|
| std::unique_ptr<int16_t> interleaved(new int16_t[num_samples]);
|
| @@ -323,7 +325,8 @@ class FullDuplexAudioSinkSource
|
| // AudioInputStream::AudioInputCallback implementation
|
| void OnData(AudioInputStream* stream,
|
| const AudioBus* src,
|
| - uint32_t hardware_delay_bytes,
|
| + base::TimeDelta delay,
|
| + base::TimeTicks delay_timestamp,
|
| double volume) override {
|
| const base::TimeTicks now_time = base::TimeTicks::Now();
|
| const int diff = (now_time - previous_time_).InMilliseconds();
|
| @@ -657,7 +660,7 @@ class AudioAndroidInputTest : public AudioAndroidOutputTest,
|
| MockAudioInputCallback sink;
|
|
|
| base::RunLoop run_loop;
|
| - EXPECT_CALL(sink, OnData(audio_input_stream_, NotNull(), _, _))
|
| + EXPECT_CALL(sink, OnData(audio_input_stream_, NotNull(), _, _, _))
|
| .Times(AtLeast(num_callbacks))
|
| .WillRepeatedly(CheckCountAndPostQuitTask(
|
| &count, num_callbacks, base::ThreadTaskRunnerHandle::Get(),
|
|
|