Pass delay and timestamp to AudioSourceCallback::OnMoreData.

media/audio/simple_sources_unittest.cc

Index: media/audio/simple_sources_unittest.cc
diff --git a/media/audio/simple_sources_unittest.cc b/media/audio/simple_sources_unittest.cc
index 8e95a78c2007d5262a459f4c422ce4d84e7b2049..df9bccb18747d8c117add7b660927949c18dc66c 100644
--- a/media/audio/simple_sources_unittest.cc
+++ b/media/audio/simple_sources_unittest.cc
@@ -12,6 +12,7 @@
 
 #include "base/files/file_util.h"
 #include "base/logging.h"
+#include "base/time/time.h"
 #include "media/audio/sounds/test_data.h"
 #include "media/base/audio_bus.h"
 #include "media/base/audio_parameters.h"
@@ -31,7 +32,8 @@ TEST(SimpleSources, SineWaveAudioSource) {
 
   SineWaveAudioSource source(1, freq, params.sample_rate());
   std::unique_ptr<AudioBus> audio_bus = AudioBus::Create(params);
-  source.OnMoreData(audio_bus.get(), 0, 0);
+  source.OnMoreData(base::TimeDelta(), base::TimeTicks::Now(), 0,
+                    audio_bus.get());
   EXPECT_EQ(1, source.callbacks());
   EXPECT_EQ(0, source.errors());
 
@@ -60,12 +62,18 @@ TEST(SimpleSources, SineWaveAudioCapped) {
   source.CapSamples(kSampleCap);
 
   std::unique_ptr<AudioBus> audio_bus = AudioBus::Create(1, 2 * kSampleCap);
-  EXPECT_EQ(source.OnMoreData(audio_bus.get(), 0, 0), kSampleCap);
+  EXPECT_EQ(source.OnMoreData(base::TimeDelta(), base::TimeTicks::Now(), 0,
+                              audio_bus.get()),
+            kSampleCap);
   EXPECT_EQ(1, source.callbacks());
-  EXPECT_EQ(source.OnMoreData(audio_bus.get(), 0, 0), 0);
+  EXPECT_EQ(source.OnMoreData(base::TimeDelta(), base::TimeTicks::Now(), 0,
+                              audio_bus.get()),
+            0);
   EXPECT_EQ(2, source.callbacks());
   source.Reset();
-  EXPECT_EQ(source.OnMoreData(audio_bus.get(), 0, 0), kSampleCap);
+  EXPECT_EQ(source.OnMoreData(base::TimeDelta(), base::TimeTicks::Now(), 0,
+                              audio_bus.get()),
+            kSampleCap);
   EXPECT_EQ(3, source.callbacks());
   EXPECT_EQ(0, source.errors());
 }
@@ -124,13 +132,16 @@ TEST(SimpleSources, FileSourceTestDataWithoutLooping) {
   // Create a FileSource that reads this file.
   bool loop = false;
   FileSource source(params, temp_path, loop);
-  EXPECT_EQ(kNumFrames, source.OnMoreData(audio_bus.get(), 0, 0));
+  EXPECT_EQ(kNumFrames,
+            source.OnMoreData(base::TimeDelta(), base::TimeTicks::Now(), 0,
+                              audio_bus.get()));
 
   VerifyContainsTestFile(audio_bus.get());
 
   // We should not play any more audio after the file reaches its end.
   audio_bus->Zero();
-  source.OnMoreData(audio_bus.get(), 0, 0);
+  source.OnMoreData(base::TimeDelta(), base::TimeTicks::Now(), 0,
+                    audio_bus.get());
   for (int channel = 0; channel < audio_bus->channels(); ++channel) {
     for (int frame = 0; frame < audio_bus->frames(); ++frame) {
       EXPECT_FLOAT_EQ(0.0, audio_bus->channel(channel)[frame]);
@@ -160,9 +171,11 @@ TEST(SimpleSources, FileSourceTestDataWithLooping) {
   FileSource source(params, temp_path, loop);
 
   // Verify that we keep reading in the file when looping.
-  source.OnMoreData(audio_bus.get(), 0, 0);
+  source.OnMoreData(base::TimeDelta(), base::TimeTicks::Now(), 0,
+                    audio_bus.get());
   audio_bus->Zero();
-  source.OnMoreData(audio_bus.get(), 0, 0);
+  source.OnMoreData(base::TimeDelta(), base::TimeTicks::Now(), 0,
+                    audio_bus.get());
 
   VerifyContainsTestFile(audio_bus.get());
 }
@@ -180,7 +193,8 @@ TEST(SimpleSources, BadFilePathFails) {
              .Append(FILE_PATH_LITERAL("exist"));
   bool loop = false;
   FileSource source(params, path, loop);
-  EXPECT_EQ(0, source.OnMoreData(audio_bus.get(), 0, 0));
+  EXPECT_EQ(0, source.OnMoreData(base::TimeDelta(), base::TimeTicks::Now(), 0,
+                                 audio_bus.get()));
 
   // Confirm all frames are zero-padded.
   for (int channel = 0; channel < audio_bus->channels(); ++channel) {
@@ -215,7 +229,8 @@ TEST(SimpleSources, FileSourceCorruptTestDataFails) {
   // Create a FileSource that reads this file.
   bool loop = false;
   FileSource source(params, temp_path, loop);
-  EXPECT_EQ(0, source.OnMoreData(audio_bus.get(), 0, 0));
+  EXPECT_EQ(0, source.OnMoreData(base::TimeDelta(), base::TimeTicks::Now(), 0,
+                                 audio_bus.get()));
 
   // Confirm all frames are zero-padded.
   for (int channel = 0; channel < audio_bus->channels(); ++channel) {