Replaced TestNowSource with SimpleTestTickClock.

components/scheduler/child/worker_scheduler_impl_unittest.cc

Index: components/scheduler/child/worker_scheduler_impl_unittest.cc
diff --git a/components/scheduler/child/worker_scheduler_impl_unittest.cc b/components/scheduler/child/worker_scheduler_impl_unittest.cc
index c9f34dbcb4fc10b5ea14e16df98ba82f4a8d039f..47b2f0a165371c9ecabb5ab523d7feb783d810b0 100644
--- a/components/scheduler/child/worker_scheduler_impl_unittest.cc
+++ b/components/scheduler/child/worker_scheduler_impl_unittest.cc
@@ -6,8 +6,8 @@
 
 #include "base/callback.h"
 #include "base/strings/stringprintf.h"
+#include "base/test/simple_test_tick_clock.h"
 #include "cc/test/ordered_simple_task_runner.h"
-#include "cc/test/test_now_source.h"
 #include "components/scheduler/child/nestable_task_runner_for_test.h"
 #include "components/scheduler/child/scheduler_message_loop_delegate.h"
 #include "components/scheduler/child/test_time_source.h"
@@ -26,17 +26,18 @@ int TimeTicksToIntMs(const base::TimeTicks& time) {
   return static_cast<int>((time - base::TimeTicks()).InMilliseconds());
 }
 
-void WakeUpTask(std::vector<std::string>* timeline, cc::TestNowSource* clock) {
+void WakeUpTask(std::vector<std::string>* timeline,
+                base::SimpleTestTickClock* clock) {
   if (timeline) {
-    timeline->push_back(base::StringPrintf("run WakeUpTask @ %d",
-                                           TimeTicksToIntMs(clock->Now())));
+    timeline->push_back(base::StringPrintf(
+        "run WakeUpTask @ %d", TimeTicksToIntMs(clock->NowTicks())));
   }
 }
 
 void RecordTimelineTask(std::vector<std::string>* timeline,
-                        cc::TestNowSource* clock) {
+                        base::SimpleTestTickClock* clock) {
   timeline->push_back(base::StringPrintf("run RecordTimelineTask @ %d",
-                                         TimeTicksToIntMs(clock->Now())));
+                                         TimeTicksToIntMs(clock->NowTicks())));
 }
 
 void AppendToVectorTestTask(std::vector<std::string>* vector,
@@ -62,7 +63,7 @@ class WorkerSchedulerImplForTest : public WorkerSchedulerImpl {
  public:
   WorkerSchedulerImplForTest(
       scoped_refptr<NestableSingleThreadTaskRunner> main_task_runner,
-      scoped_refptr<cc::TestNowSource> clock_)
+      base::SimpleTestTickClock* clock_)
       : WorkerSchedulerImpl(main_task_runner),
         clock_(clock_),
         timeline_(nullptr) {}
@@ -85,26 +86,26 @@ class WorkerSchedulerImplForTest : public WorkerSchedulerImpl {
 
   void IsNotQuiescent() override {
     if (timeline_) {
-      timeline_->push_back(base::StringPrintf("IsNotQuiescent @ %d",
-                                              TimeTicksToIntMs(clock_->Now())));
+      timeline_->push_back(base::StringPrintf(
+          "IsNotQuiescent @ %d", TimeTicksToIntMs(clock_->NowTicks())));
     }
     WorkerSchedulerImpl::IsNotQuiescent();
   }
 
-  scoped_refptr<cc::TestNowSource> clock_;
+  base::SimpleTestTickClock* clock_;
   std::vector<std::string>* timeline_;  // NOT OWNED
 };
 
 class WorkerSchedulerImplTest : public testing::Test {
  public:
   WorkerSchedulerImplTest()
-      : clock_(cc::TestNowSource::Create(5000)),
-        mock_task_runner_(new cc::OrderedSimpleTaskRunner(clock_, true)),
-        nestable_task_runner_(
-            NestableTaskRunnerForTest::Create(mock_task_runner_)),
-        scheduler_(
-            new WorkerSchedulerImplForTest(nestable_task_runner_, clock_)),
-        timeline_(nullptr) {
+      : clock_(new base::SimpleTestTickClock()), timeline_(nullptr) {
+    clock_->Advance(base::TimeDelta::FromInternalValue(5000));

[Sami, 2015/05/29 14:00:58]

Ditto about the starting time value.

[Ankur Verma, 2015/06/03 14:56:10]

Have'nt changed starting values yet as per mithro's explaination.

+    mock_task_runner_ = new cc::OrderedSimpleTaskRunner(clock_, true);
+    nestable_task_runner_ =
+        NestableTaskRunnerForTest::Create(mock_task_runner_);
+    scheduler_ = make_scoped_ptr(
+        new WorkerSchedulerImplForTest(nestable_task_runner_, clock_));
     scheduler_->GetSchedulerHelperForTesting()->SetTimeSourceForTesting(
         make_scoped_ptr(new TestTimeSource(clock_)));
     scheduler_->GetSchedulerHelperForTesting()
@@ -134,13 +135,13 @@ class WorkerSchedulerImplTest : public testing::Test {
 
   void RunUntilIdle() {
     if (timeline_) {
-      timeline_->push_back(base::StringPrintf("RunUntilIdle begin @ %d",
-                                              TimeTicksToIntMs(clock_->Now())));
+      timeline_->push_back(base::StringPrintf(
+          "RunUntilIdle begin @ %d", TimeTicksToIntMs(clock_->NowTicks())));
     }
     mock_task_runner_->RunUntilIdle();
     if (timeline_) {
-      timeline_->push_back(base::StringPrintf("RunUntilIdle end @ %d",
-                                              TimeTicksToIntMs(clock_->Now())));
+      timeline_->push_back(base::StringPrintf(
+          "RunUntilIdle end @ %d", TimeTicksToIntMs(clock_->NowTicks())));
     }
   }
 
@@ -151,7 +152,7 @@ class WorkerSchedulerImplTest : public testing::Test {
     // AFTER the delay for this has expired.
     default_task_runner_->PostDelayedTask(
         FROM_HERE, base::Bind(&WakeUpTask, base::Unretained(timeline_),
-                              base::Unretained(clock_.get())),
+                              base::Unretained(clock_)),
         base::TimeDelta::FromMilliseconds(100));
   }
 
@@ -188,7 +189,7 @@ class WorkerSchedulerImplTest : public testing::Test {
   }
 
  protected:
-  scoped_refptr<cc::TestNowSource> clock_;
+  base::SimpleTestTickClock* clock_;

[Sami, 2015/05/29 14:00:58]

Ditto about scoped_ptr.

[Ankur Verma, 2015/06/03 14:56:10]

Done.

   // Only one of mock_task_runner_ or message_loop_ will be set.
   scoped_refptr<cc::OrderedSimpleTaskRunner> mock_task_runner_;
 
@@ -284,7 +285,7 @@ TEST_F(WorkerSchedulerImplTest, TestIdleDeadlineWithPendingDelayedTask) {
   // Post a delayed task timed to occur mid way during the long idle period.
   default_task_runner_->PostDelayedTask(
       FROM_HERE, base::Bind(&RecordTimelineTask, base::Unretained(&timeline),
-                            base::Unretained(clock_.get())),
+                            base::Unretained(clock_)),
       base::TimeDelta::FromMilliseconds(420));
   idle_task_runner_->PostIdleTask(FROM_HERE,
                                   base::Bind(&TimelineIdleTestTask, &timeline));
@@ -313,7 +314,7 @@ TEST_F(WorkerSchedulerImplTest,
   // Post a delayed task timed to occur well after the long idle period.
   default_task_runner_->PostDelayedTask(
       FROM_HERE, base::Bind(&RecordTimelineTask, base::Unretained(&timeline),
-                            base::Unretained(clock_.get())),
+                            base::Unretained(clock_)),
       base::TimeDelta::FromMilliseconds(1000));
   idle_task_runner_->PostIdleTask(FROM_HERE,
                                   base::Bind(&TimelineIdleTestTask, &timeline));
@@ -382,7 +383,7 @@ TEST_F(WorkerSchedulerImplTest, TestLongIdlePeriodTimeline) {
   // idle period.
   base::TimeTicks idle_period_deadline =
       scheduler_->CurrentIdleTaskDeadlineForTesting();
-  clock_->AdvanceNow(maximum_idle_period_duration());
+  clock_->Advance(maximum_idle_period_duration());
   RunUntilIdle();
 
   base::TimeTicks new_idle_period_deadline =
@@ -402,7 +403,7 @@ TEST_F(WorkerSchedulerImplTest, TestLongIdlePeriodTimeline) {
   timeline.push_back("Post RecordTimelineTask");
   default_task_runner_->PostTask(
       FROM_HERE, base::Bind(&RecordTimelineTask, base::Unretained(&timeline),
-                            base::Unretained(clock_.get())));
+                            base::Unretained(clock_)));
   RunUntilIdle();
 
   std::string expected_timeline[] = {