Reland: Make more media APIs aware of |delay| and |delay_timestamp|

media/base/silent_sink_suspender_unittest.cc

Index: media/base/silent_sink_suspender_unittest.cc
diff --git a/media/base/silent_sink_suspender_unittest.cc b/media/base/silent_sink_suspender_unittest.cc
index c69084b4c32593bffdb0cc9e86ed72e8cdd8da86..4434d69d658f763f7a8b9944ae9de7b9bbef27e7 100644
--- a/media/base/silent_sink_suspender_unittest.cc
+++ b/media/base/silent_sink_suspender_unittest.cc
@@ -49,7 +49,9 @@ class SilentSinkSuspenderTest : public testing::Test {
 
 TEST_F(SilentSinkSuspenderTest, BasicPassthough) {
   temp_bus_->Zero();
-  EXPECT_EQ(temp_bus_->frames(), suspender_.Render(temp_bus_.get(), 0, 0));
+  EXPECT_EQ(temp_bus_->frames(),
+            suspender_.Render(base::TimeDelta(), base::TimeTicks(), 0,
+                              temp_bus_.get()));
   EXPECT_FALSE(temp_bus_->AreFramesZero());
 }
 
@@ -57,7 +59,9 @@ TEST_F(SilentSinkSuspenderTest, SuspendResumeTriggered) {
   // Verify a normal Render() doesn't invoke suspend.
   EXPECT_FALSE(suspender_.is_using_fake_sink_for_testing());
   temp_bus_->Zero();
-  EXPECT_EQ(temp_bus_->frames(), suspender_.Render(temp_bus_.get(), 0, 0));
+  EXPECT_EQ(temp_bus_->frames(),
+            suspender_.Render(base::TimeDelta(), base::TimeTicks(), 0,
+                              temp_bus_.get()));
   EXPECT_FALSE(temp_bus_->AreFramesZero());
   base::RunLoop().RunUntilIdle();
   EXPECT_FALSE(suspender_.is_using_fake_sink_for_testing());
@@ -65,7 +69,9 @@ TEST_F(SilentSinkSuspenderTest, SuspendResumeTriggered) {
   // Mute all audio generated by the callback, this should suspend immediately.
   fake_callback_.set_volume(0);
   temp_bus_->Zero();
-  EXPECT_EQ(temp_bus_->frames(), suspender_.Render(temp_bus_.get(), 0, 0));
+  EXPECT_EQ(temp_bus_->frames(),
+            suspender_.Render(base::TimeDelta(), base::TimeTicks(), 0,
+                              temp_bus_.get()));
   EXPECT_TRUE(temp_bus_->AreFramesZero());
   {
     base::RunLoop run_loop;
@@ -91,9 +97,12 @@ TEST_F(SilentSinkSuspenderTest, SuspendResumeTriggered) {
   // not silent.
   fake_callback_.reset();
   std::unique_ptr<AudioBus> true_bus = AudioBus::Create(params_);
-  fake_callback_.Render(true_bus.get(), 0, 0);
+  fake_callback_.Render(base::TimeDelta(), base::TimeTicks(), 0,
+                        true_bus.get());
   EXPECT_FALSE(true_bus->AreFramesZero());
-  EXPECT_EQ(temp_bus_->frames(), suspender_.Render(temp_bus_.get(), 0, 0));
+  EXPECT_EQ(temp_bus_->frames(),
+            suspender_.Render(base::TimeDelta(), base::TimeTicks(), 0,
+                              temp_bus_.get()));
   EXPECT_EQ(memcmp(temp_bus_->channel(0), true_bus->channel(0),
                    temp_bus_->frames() * sizeof(float)),
             0);
@@ -103,11 +112,15 @@ TEST_F(SilentSinkSuspenderTest, MultipleSuspend) {
   // Mute all audio generated by the callback, this should suspend immediately.
   fake_callback_.set_volume(0);
   temp_bus_->Zero();
-  EXPECT_EQ(temp_bus_->frames(), suspender_.Render(temp_bus_.get(), 0, 0));
+  EXPECT_EQ(temp_bus_->frames(),
+            suspender_.Render(base::TimeDelta(), base::TimeTicks(), 0,
+                              temp_bus_.get()));
   EXPECT_TRUE(temp_bus_->AreFramesZero());
 
   // A second render should only result in a single Pause() call.
-  EXPECT_EQ(temp_bus_->frames(), suspender_.Render(temp_bus_.get(), 0, 0));
+  EXPECT_EQ(temp_bus_->frames(),
+            suspender_.Render(base::TimeDelta(), base::TimeTicks(), 0,
+                              temp_bus_.get()));
 
   EXPECT_CALL(*mock_sink_, Pause());
   base::RunLoop().RunUntilIdle();
@@ -118,7 +131,9 @@ TEST_F(SilentSinkSuspenderTest, MultipleResume) {
   // Mute all audio generated by the callback, this should suspend immediately.
   fake_callback_.set_volume(0);
   temp_bus_->Zero();
-  EXPECT_EQ(temp_bus_->frames(), suspender_.Render(temp_bus_.get(), 0, 0));
+  EXPECT_EQ(temp_bus_->frames(),
+            suspender_.Render(base::TimeDelta(), base::TimeTicks(), 0,
+                              temp_bus_.get()));
   EXPECT_TRUE(temp_bus_->AreFramesZero());
   EXPECT_CALL(*mock_sink_, Pause());
   base::RunLoop().RunUntilIdle();
@@ -130,9 +145,11 @@ TEST_F(SilentSinkSuspenderTest, MultipleResume) {
   // Prepare our equality testers.
   fake_callback_.reset();
   std::unique_ptr<AudioBus> true_bus1 = AudioBus::Create(params_);
-  fake_callback_.Render(true_bus1.get(), 0, 0);
+  fake_callback_.Render(base::TimeDelta(), base::TimeTicks(), 0,
+                        true_bus1.get());
   std::unique_ptr<AudioBus> true_bus2 = AudioBus::Create(params_);
-  fake_callback_.Render(true_bus2.get(), 0, 0);
+  fake_callback_.Render(base::TimeDelta(), base::TimeTicks(), 0,
+                        true_bus2.get());
   EXPECT_NE(memcmp(true_bus1->channel(0), true_bus2->channel(0),
                    true_bus1->frames() * sizeof(float)),
             0);
@@ -140,18 +157,26 @@ TEST_F(SilentSinkSuspenderTest, MultipleResume) {
   // Reset the fake callback data generation and force two Render() calls before
   // the sink can transition.
   fake_callback_.reset();
-  EXPECT_EQ(temp_bus_->frames(), suspender_.Render(nullptr, 0, 0));
-  EXPECT_EQ(temp_bus_->frames(), suspender_.Render(nullptr, 0, 0));
+  EXPECT_EQ(
+      temp_bus_->frames(),
+      suspender_.Render(base::TimeDelta(), base::TimeTicks(), 0, nullptr));
+  EXPECT_EQ(
+      temp_bus_->frames(),
+      suspender_.Render(base::TimeDelta(), base::TimeTicks(), 0, nullptr));
   EXPECT_CALL(*mock_sink_, Play());
   base::RunLoop().RunUntilIdle();
   EXPECT_FALSE(suspender_.is_using_fake_sink_for_testing());
 
   // Each render after resuming should return one of the non-silent bus.
-  EXPECT_EQ(temp_bus_->frames(), suspender_.Render(temp_bus_.get(), 0, 0));
+  EXPECT_EQ(temp_bus_->frames(),
+            suspender_.Render(base::TimeDelta(), base::TimeTicks(), 0,
+                              temp_bus_.get()));
   EXPECT_EQ(memcmp(temp_bus_->channel(0), true_bus1->channel(0),
                    temp_bus_->frames() * sizeof(float)),
             0);
-  EXPECT_EQ(temp_bus_->frames(), suspender_.Render(temp_bus_.get(), 0, 0));
+  EXPECT_EQ(temp_bus_->frames(),
+            suspender_.Render(base::TimeDelta(), base::TimeTicks(), 0,
+                              temp_bus_.get()));
   EXPECT_EQ(memcmp(temp_bus_->channel(0), true_bus2->channel(0),
                    temp_bus_->frames() * sizeof(float)),
             0);