Revert of 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 4434d69d658f763f7a8b9944ae9de7b9bbef27e7..c69084b4c32593bffdb0cc9e86ed72e8cdd8da86 100644
--- a/media/base/silent_sink_suspender_unittest.cc
+++ b/media/base/silent_sink_suspender_unittest.cc
@@ -49,9 +49,7 @@
 
 TEST_F(SilentSinkSuspenderTest, BasicPassthough) {
   temp_bus_->Zero();
-  EXPECT_EQ(temp_bus_->frames(),
-            suspender_.Render(base::TimeDelta(), base::TimeTicks(), 0,
-                              temp_bus_.get()));
+  EXPECT_EQ(temp_bus_->frames(), suspender_.Render(temp_bus_.get(), 0, 0));
   EXPECT_FALSE(temp_bus_->AreFramesZero());
 }
 
@@ -59,9 +57,7 @@
   // 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(base::TimeDelta(), base::TimeTicks(), 0,
-                              temp_bus_.get()));
+  EXPECT_EQ(temp_bus_->frames(), suspender_.Render(temp_bus_.get(), 0, 0));
   EXPECT_FALSE(temp_bus_->AreFramesZero());
   base::RunLoop().RunUntilIdle();
   EXPECT_FALSE(suspender_.is_using_fake_sink_for_testing());
@@ -69,9 +65,7 @@
   // 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(base::TimeDelta(), base::TimeTicks(), 0,
-                              temp_bus_.get()));
+  EXPECT_EQ(temp_bus_->frames(), suspender_.Render(temp_bus_.get(), 0, 0));
   EXPECT_TRUE(temp_bus_->AreFramesZero());
   {
     base::RunLoop run_loop;
@@ -97,12 +91,9 @@
   // not silent.
   fake_callback_.reset();
   std::unique_ptr<AudioBus> true_bus = AudioBus::Create(params_);
-  fake_callback_.Render(base::TimeDelta(), base::TimeTicks(), 0,
-                        true_bus.get());
+  fake_callback_.Render(true_bus.get(), 0, 0);
   EXPECT_FALSE(true_bus->AreFramesZero());
-  EXPECT_EQ(temp_bus_->frames(),
-            suspender_.Render(base::TimeDelta(), base::TimeTicks(), 0,
-                              temp_bus_.get()));
+  EXPECT_EQ(temp_bus_->frames(), suspender_.Render(temp_bus_.get(), 0, 0));
   EXPECT_EQ(memcmp(temp_bus_->channel(0), true_bus->channel(0),
                    temp_bus_->frames() * sizeof(float)),
             0);
@@ -112,15 +103,11 @@
   // 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(base::TimeDelta(), base::TimeTicks(), 0,
-                              temp_bus_.get()));
+  EXPECT_EQ(temp_bus_->frames(), suspender_.Render(temp_bus_.get(), 0, 0));
   EXPECT_TRUE(temp_bus_->AreFramesZero());
 
   // A second render should only result in a single Pause() call.
-  EXPECT_EQ(temp_bus_->frames(),
-            suspender_.Render(base::TimeDelta(), base::TimeTicks(), 0,
-                              temp_bus_.get()));
+  EXPECT_EQ(temp_bus_->frames(), suspender_.Render(temp_bus_.get(), 0, 0));
 
   EXPECT_CALL(*mock_sink_, Pause());
   base::RunLoop().RunUntilIdle();
@@ -131,9 +118,7 @@
   // 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(base::TimeDelta(), base::TimeTicks(), 0,
-                              temp_bus_.get()));
+  EXPECT_EQ(temp_bus_->frames(), suspender_.Render(temp_bus_.get(), 0, 0));
   EXPECT_TRUE(temp_bus_->AreFramesZero());
   EXPECT_CALL(*mock_sink_, Pause());
   base::RunLoop().RunUntilIdle();
@@ -145,11 +130,9 @@
   // Prepare our equality testers.
   fake_callback_.reset();
   std::unique_ptr<AudioBus> true_bus1 = AudioBus::Create(params_);
-  fake_callback_.Render(base::TimeDelta(), base::TimeTicks(), 0,
-                        true_bus1.get());
+  fake_callback_.Render(true_bus1.get(), 0, 0);
   std::unique_ptr<AudioBus> true_bus2 = AudioBus::Create(params_);
-  fake_callback_.Render(base::TimeDelta(), base::TimeTicks(), 0,
-                        true_bus2.get());
+  fake_callback_.Render(true_bus2.get(), 0, 0);
   EXPECT_NE(memcmp(true_bus1->channel(0), true_bus2->channel(0),
                    true_bus1->frames() * sizeof(float)),
             0);
@@ -157,26 +140,18 @@
   // 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(base::TimeDelta(), base::TimeTicks(), 0, nullptr));
-  EXPECT_EQ(
-      temp_bus_->frames(),
-      suspender_.Render(base::TimeDelta(), base::TimeTicks(), 0, nullptr));
+  EXPECT_EQ(temp_bus_->frames(), suspender_.Render(nullptr, 0, 0));
+  EXPECT_EQ(temp_bus_->frames(), suspender_.Render(nullptr, 0, 0));
   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(base::TimeDelta(), base::TimeTicks(), 0,
-                              temp_bus_.get()));
+  EXPECT_EQ(temp_bus_->frames(), suspender_.Render(temp_bus_.get(), 0, 0));
   EXPECT_EQ(memcmp(temp_bus_->channel(0), true_bus1->channel(0),
                    temp_bus_->frames() * sizeof(float)),
             0);
-  EXPECT_EQ(temp_bus_->frames(),
-            suspender_.Render(base::TimeDelta(), base::TimeTicks(), 0,
-                              temp_bus_.get()));
+  EXPECT_EQ(temp_bus_->frames(), suspender_.Render(temp_bus_.get(), 0, 0));
   EXPECT_EQ(memcmp(temp_bus_->channel(0), true_bus2->channel(0),
                    temp_bus_->frames() * sizeof(float)),
             0);