Replaced TestNowSource with SimpleTestTickClock.

components/scheduler/child/worker_scheduler_impl_unittest.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/scheduler/child/worker_scheduler_impl.h"
 
 #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"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using testing::ElementsAreArray;
 
 namespace scheduler {
 
 namespace {
 void NopTask() {
 }
 
 int TimeTicksToIntMs(const base::TimeTicks& time) {
   return static_cast<int>((time - base::TimeTicks()).InMilliseconds());
 }
 
 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,
                             std::string value) {
   vector->push_back(value);
 }
 
 void AppendToVectorIdleTestTask(std::vector<std::string>* vector,
                                 std::string value,
                                 base::TimeTicks deadline) {
   AppendToVectorTestTask(vector, value);
 }
 
 void TimelineIdleTestTask(std::vector<std::string>* timeline,
                           base::TimeTicks deadline) {
   timeline->push_back(base::StringPrintf("run TimelineIdleTestTask deadline %d",
                                          TimeTicksToIntMs(deadline)));
 }
 
 };  // namespace
 
 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) {}
 
   void RecordTimelineEvents(std::vector<std::string>* timeline) {
     timeline_ = timeline;
   }
 
  private:
   bool CanEnterLongIdlePeriod(
       base::TimeTicks now,
       base::TimeDelta* next_long_idle_period_delay_out) override {
     if (timeline_) {
       timeline_->push_back(base::StringPrintf("CanEnterLongIdlePeriod @ %d",
                                               TimeTicksToIntMs(now)));
     }
     return WorkerSchedulerImpl::CanEnterLongIdlePeriod(
         now, next_long_idle_period_delay_out);
   }
 
   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_;    // NOT OWNED
   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)),
+      : clock_(new base::SimpleTestTickClock()),
+        mock_task_runner_(new cc::OrderedSimpleTaskRunner(clock_.get(), true)),
         nestable_task_runner_(
             NestableTaskRunnerForTest::Create(mock_task_runner_)),
-        scheduler_(
-            new WorkerSchedulerImplForTest(nestable_task_runner_, clock_)),
+        scheduler_(new WorkerSchedulerImplForTest(nestable_task_runner_,
+                                                  clock_.get())),
         timeline_(nullptr) {
+    clock_->Advance(base::TimeDelta::FromInternalValue(5000));

[Sami, 2015/06/08 13:59:02]

Could you change all the places you're adding this to use
base::TimeDelta::FromMicroseconds() instead?

[Ankur Verma, 2015/06/09 07:53:47]

Acknowledged.

[Ankur Verma, 2015/06/09 13:53:43]

Done.

     scheduler_->GetSchedulerHelperForTesting()->SetTimeSourceForTesting(
-        make_scoped_ptr(new TestTimeSource(clock_)));
+        make_scoped_ptr(new TestTimeSource(clock_.get())));
     scheduler_->GetSchedulerHelperForTesting()
         ->GetTaskQueueManagerForTesting()
-        ->SetTimeSourceForTesting(make_scoped_ptr(new TestTimeSource(clock_)));
+        ->SetTimeSourceForTesting(
+            make_scoped_ptr(new TestTimeSource(clock_.get())));
   }
 
   ~WorkerSchedulerImplTest() override {}
 
   void TearDown() override {
     // Check that all tests stop posting tasks.
     while (mock_task_runner_->RunUntilIdle()) {
     }
   }
 
   void Init() {
     scheduler_->Init();
     default_task_runner_ = scheduler_->DefaultTaskRunner();
     idle_task_runner_ = scheduler_->IdleTaskRunner();
     timeline_ = nullptr;
   }
 
   void RecordTimelineEvents(std::vector<std::string>* timeline) {
     timeline_ = timeline;
     scheduler_->RecordTimelineEvents(timeline);
   }
 
   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())));
     }
   }
 
   // Helper for posting several tasks of specific types. |task_descriptor| is a
   // string with space delimited task identifiers. The first letter of each
   // task identifier specifies the task type:
   // - 'D': Default task
   // - 'I': Idle task
   void PostTestTasks(std::vector<std::string>* run_order,
                      const std::string& task_descriptor) {
@@ skipping 16 matching lines @@
       }
     }
   }
 
   static base::TimeDelta maximum_idle_period_duration() {
     return base::TimeDelta::FromMilliseconds(
         IdleHelper::kMaximumIdlePeriodMillis);
   }
 
  protected:
-  scoped_refptr<cc::TestNowSource> clock_;
+  scoped_ptr<base::SimpleTestTickClock> clock_;
   // Only one of mock_task_runner_ or message_loop_ will be set.
   scoped_refptr<cc::OrderedSimpleTaskRunner> mock_task_runner_;
 
   scoped_refptr<NestableSingleThreadTaskRunner> nestable_task_runner_;
   scoped_ptr<WorkerSchedulerImplForTest> scheduler_;
   scoped_refptr<base::SingleThreadTaskRunner> default_task_runner_;
   scoped_refptr<SingleThreadIdleTaskRunner> idle_task_runner_;
   std::vector<std::string>* timeline_;  // NOT OWNED
 
   DISALLOW_COPY_AND_ASSIGN(WorkerSchedulerImplTest);
@@ skipping 153 matching lines @@
 
   std::vector<std::string> timeline;
   RecordTimelineEvents(&timeline);
 
   // The scheduler should not run the initiate_next_long_idle_period task if
   // there are no idle tasks and no other task woke up the scheduler, thus
   // the idle period deadline shouldn't update at the end of the current long
   // 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 =
       scheduler_->CurrentIdleTaskDeadlineForTesting();
   EXPECT_EQ(idle_period_deadline, new_idle_period_deadline);
 
   // Posting a after-wakeup idle task also shouldn't wake the scheduler or
   // initiate the next long idle period.
   timeline.push_back("PostIdleTaskAfterWakeup");
   idle_task_runner_->PostIdleTaskAfterWakeup(
@@ skipping 20 matching lines @@
       "run RecordTimelineTask @ 55",
       "IsNotQuiescent @ 55",  // NOTE we have to wait for quiescence.
       "CanEnterLongIdlePeriod @ 355",
       "run TimelineIdleTestTask deadline 405",
       "RunUntilIdle end @ 355"};
 
   EXPECT_THAT(timeline, ElementsAreArray(expected_timeline));
 }
 
 }  // namespace scheduler