Replaced TestNowSource with SimpleTestTickClock.

components/scheduler/renderer/deadline_task_runner_unittest.cc

Index: components/scheduler/renderer/deadline_task_runner_unittest.cc
diff --git a/components/scheduler/renderer/deadline_task_runner_unittest.cc b/components/scheduler/renderer/deadline_task_runner_unittest.cc
index ae56f4146f744e2954928c6c211e2854eaea7789..1cffa69d88b0b86059812eb4f5c5cec7455a04a6 100644
--- a/components/scheduler/renderer/deadline_task_runner_unittest.cc
+++ b/components/scheduler/renderer/deadline_task_runner_unittest.cc
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "base/test/simple_test_tick_clock.h"
 #include "components/scheduler/renderer/deadline_task_runner.h"
 
 #include "cc/test/ordered_simple_task_runner.h"
-#include "cc/test/test_now_source.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ -17,8 +17,9 @@ class DeadlineTaskRunnerTest : public testing::Test {
   ~DeadlineTaskRunnerTest() override {}
 
   void SetUp() override {
-    clock_ = cc::TestNowSource::Create(5000);
-    mock_task_runner_ = new cc::OrderedSimpleTaskRunner(clock_, true);
+    clock_.reset(new base::SimpleTestTickClock());
+    clock_->Advance(base::TimeDelta::FromMicroseconds(5000));
+    mock_task_runner_ = new cc::OrderedSimpleTaskRunner(clock_.get(), true);
     deadline_task_runner_.reset(new DeadlineTaskRunner(
         base::Bind(&DeadlineTaskRunnerTest::TestTask, base::Unretained(this)),
         mock_task_runner_));
@@ -27,18 +28,18 @@ class DeadlineTaskRunnerTest : public testing::Test {
 
   bool RunUntilIdle() { return mock_task_runner_->RunUntilIdle(); }
 
-  void TestTask() { run_times_.push_back(clock_->Now()); }
+  void TestTask() { run_times_.push_back(clock_->NowTicks()); }
 
-  scoped_refptr<cc::TestNowSource> clock_;
+  scoped_ptr<base::SimpleTestTickClock> clock_;
   scoped_refptr<cc::OrderedSimpleTaskRunner> mock_task_runner_;
   scoped_ptr<DeadlineTaskRunner> deadline_task_runner_;
   std::vector<base::TimeTicks> run_times_;
 };
 
 TEST_F(DeadlineTaskRunnerTest, RunOnce) {
-  base::TimeTicks start_time = clock_->Now();
+  base::TimeTicks start_time = clock_->NowTicks();
   base::TimeDelta delay = base::TimeDelta::FromMilliseconds(10);
-  deadline_task_runner_->SetDeadline(FROM_HERE, delay, clock_->Now());
+  deadline_task_runner_->SetDeadline(FROM_HERE, delay, clock_->NowTicks());
   RunUntilIdle();
 
   EXPECT_THAT(run_times_, testing::ElementsAre(start_time + delay));
@@ -46,26 +47,26 @@ TEST_F(DeadlineTaskRunnerTest, RunOnce) {
 
 TEST_F(DeadlineTaskRunnerTest, RunTwice) {
   base::TimeDelta delay1 = base::TimeDelta::FromMilliseconds(10);
-  base::TimeTicks deadline1 = clock_->Now() + delay1;
-  deadline_task_runner_->SetDeadline(FROM_HERE, delay1, clock_->Now());
+  base::TimeTicks deadline1 = clock_->NowTicks() + delay1;
+  deadline_task_runner_->SetDeadline(FROM_HERE, delay1, clock_->NowTicks());
   RunUntilIdle();
 
   base::TimeDelta delay2 = base::TimeDelta::FromMilliseconds(100);
-  base::TimeTicks deadline2 = clock_->Now() + delay2;
-  deadline_task_runner_->SetDeadline(FROM_HERE, delay2, clock_->Now());
+  base::TimeTicks deadline2 = clock_->NowTicks() + delay2;
+  deadline_task_runner_->SetDeadline(FROM_HERE, delay2, clock_->NowTicks());
   RunUntilIdle();
 
   EXPECT_THAT(run_times_, testing::ElementsAre(deadline1, deadline2));
 };
 
 TEST_F(DeadlineTaskRunnerTest, EarlierDeadlinesTakePrecidence) {
-  base::TimeTicks start_time = clock_->Now();
+  base::TimeTicks start_time = clock_->NowTicks();
   base::TimeDelta delay1 = base::TimeDelta::FromMilliseconds(1);
   base::TimeDelta delay10 = base::TimeDelta::FromMilliseconds(10);
   base::TimeDelta delay100 = base::TimeDelta::FromMilliseconds(100);
-  deadline_task_runner_->SetDeadline(FROM_HERE, delay100, clock_->Now());
-  deadline_task_runner_->SetDeadline(FROM_HERE, delay10, clock_->Now());
-  deadline_task_runner_->SetDeadline(FROM_HERE, delay1, clock_->Now());
+  deadline_task_runner_->SetDeadline(FROM_HERE, delay100, clock_->NowTicks());
+  deadline_task_runner_->SetDeadline(FROM_HERE, delay10, clock_->NowTicks());
+  deadline_task_runner_->SetDeadline(FROM_HERE, delay1, clock_->NowTicks());
 
   RunUntilIdle();
 
@@ -73,11 +74,11 @@ TEST_F(DeadlineTaskRunnerTest, EarlierDeadlinesTakePrecidence) {
 };
 
 TEST_F(DeadlineTaskRunnerTest, LaterDeadlinesIgnored) {
-  base::TimeTicks start_time = clock_->Now();
+  base::TimeTicks start_time = clock_->NowTicks();
   base::TimeDelta delay100 = base::TimeDelta::FromMilliseconds(100);
   base::TimeDelta delay10000 = base::TimeDelta::FromMilliseconds(10000);
-  deadline_task_runner_->SetDeadline(FROM_HERE, delay100, clock_->Now());
-  deadline_task_runner_->SetDeadline(FROM_HERE, delay10000, clock_->Now());
+  deadline_task_runner_->SetDeadline(FROM_HERE, delay100, clock_->NowTicks());
+  deadline_task_runner_->SetDeadline(FROM_HERE, delay10000, clock_->NowTicks());
 
   RunUntilIdle();
 
@@ -86,7 +87,7 @@ TEST_F(DeadlineTaskRunnerTest, LaterDeadlinesIgnored) {
 
 TEST_F(DeadlineTaskRunnerTest, DeleteDeadlineTaskRunnerAfterPosting) {
   deadline_task_runner_->SetDeadline(
-      FROM_HERE, base::TimeDelta::FromMilliseconds(10), clock_->Now());
+      FROM_HERE, base::TimeDelta::FromMilliseconds(10), clock_->NowTicks());
 
   // Deleting the pending task should cancel it.
   deadline_task_runner_.reset(nullptr);