Replaced TestNowSource with SimpleTestTickClock.

cc/test/ordered_simple_task_runner.cc

 // Copyright 2014 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 "cc/test/ordered_simple_task_runner.h"
 
 #include <limits>
 #include <set>
 #include <sstream>
 #include <string>
@@ skipping 57 matching lines @@
   return state;
 }
 
 void TestOrderablePendingTask::AsValueInto(
     base::trace_event::TracedValue* state) const {
   state->SetInteger("id", task_id_);
   state->SetInteger("run_at", GetTimeToRun().ToInternalValue());
   state->SetString("posted_from", location.ToString());
 }
 
-OrderedSimpleTaskRunner::OrderedSimpleTaskRunner()
-    : advance_now_(true),
-      now_src_(TestNowSource::Create(0)),
-      max_tasks_(kAbsoluteMaxTasks),
-      inside_run_tasks_until_(false) {
-}
-
 OrderedSimpleTaskRunner::OrderedSimpleTaskRunner(
-    scoped_refptr<TestNowSource> now_src,
+    base::SimpleTestTickClock* now_src,
     bool advance_now)
     : advance_now_(advance_now),
       now_src_(now_src),
       max_tasks_(kAbsoluteMaxTasks),
       inside_run_tasks_until_(false) {
 }
 
 OrderedSimpleTaskRunner::~OrderedSimpleTaskRunner() {}
 
+base::TimeTicks OrderedSimpleTaskRunner::AbsoluteMaxNow() {
+  return base::TimeTicks::FromInternalValue(
+      std::numeric_limits<int64_t>::max());
+}
+
 // base::TestSimpleTaskRunner implementation
 bool OrderedSimpleTaskRunner::PostDelayedTask(
     const tracked_objects::Location& from_here,
     const base::Closure& task,
     base::TimeDelta delay) {
   DCHECK(thread_checker_.CalledOnValidThread());
-  TestOrderablePendingTask pt(
-      from_here, task, now_src_->Now(), delay, base::TestPendingTask::NESTABLE);
+  TestOrderablePendingTask pt(from_here, task, now_src_->NowTicks(), delay,
+                              base::TestPendingTask::NESTABLE);
 
   TRACE_TASK("OrderedSimpleTaskRunner::PostDelayedTask", pt);
   pending_tasks_.insert(pt);
   return true;
 }
 
 bool OrderedSimpleTaskRunner::PostNonNestableDelayedTask(
     const tracked_objects::Location& from_here,
     const base::Closure& task,
     base::TimeDelta delay) {
   DCHECK(thread_checker_.CalledOnValidThread());
-  TestOrderablePendingTask pt(from_here,
-                              task,
-                              now_src_->Now(),
-                              delay,
+  TestOrderablePendingTask pt(from_here, task, now_src_->NowTicks(), delay,
                               base::TestPendingTask::NON_NESTABLE);
 
   TRACE_TASK("OrderedSimpleTaskRunner::PostNonNestableDelayedTask", pt);
   pending_tasks_.insert(pt);
   return true;
 }
 
 bool OrderedSimpleTaskRunner::RunsTasksOnCurrentThread() const {
   DCHECK(thread_checker_.CalledOnValidThread());
   return true;
 }
 
 size_t OrderedSimpleTaskRunner::NumPendingTasks() const {
   return pending_tasks_.size();
 }
 
 bool OrderedSimpleTaskRunner::HasPendingTasks() const {
   return pending_tasks_.size() > 0;
 }
 
 base::TimeTicks OrderedSimpleTaskRunner::NextTaskTime() {
   if (pending_tasks_.size() <= 0) {
-    return TestNowSource::kAbsoluteMaxNow;
+    return AbsoluteMaxNow();
   }
 
   return pending_tasks_.begin()->GetTimeToRun();
 }
 
 base::TimeDelta OrderedSimpleTaskRunner::DelayToNextTaskTime() {
   DCHECK(thread_checker_.CalledOnValidThread());
 
   if (pending_tasks_.size() <= 0) {
-    return TestNowSource::kAbsoluteMaxNow - base::TimeTicks();
+    return AbsoluteMaxNow() - base::TimeTicks();
   }
 
-  base::TimeDelta delay = NextTaskTime() - now_src_->Now();
+  base::TimeDelta delay = NextTaskTime() - now_src_->NowTicks();
   if (delay > base::TimeDelta())
     return delay;
   return base::TimeDelta();
 }
 
 const size_t OrderedSimpleTaskRunner::kAbsoluteMaxTasks =
     std::numeric_limits<size_t>::max();
 
 bool OrderedSimpleTaskRunner::RunTasksWhile(
     base::Callback<bool(void)> condition) {
@@ skipping 20 matching lines @@
 
   // Make a copy so we can append some extra run checks.
   std::vector<base::Callback<bool(void)>> modifiable_conditions(conditions);
 
   // Provide a timeout base on number of tasks run so this doesn't loop
   // forever.
   modifiable_conditions.push_back(TaskRunCountBelow(max_tasks_));
 
   // If to advance now or not
   if (!advance_now_) {
-    modifiable_conditions.push_back(NowBefore(now_src_->Now()));
+    modifiable_conditions.push_back(NowBefore(now_src_->NowTicks()));
   } else {
     modifiable_conditions.push_back(AdvanceNow());
   }
 
   while (pending_tasks_.size() > 0) {
     // Check if we should continue to run pending tasks.
     bool condition_success = true;
     for (std::vector<base::Callback<bool(void)>>::iterator it =
              modifiable_conditions.begin();
          it != modifiable_conditions.end();
@@ skipping 28 matching lines @@
 bool OrderedSimpleTaskRunner::RunPendingTasks() {
   return RunTasksWhile(TaskExistedInitially());
 }
 
 bool OrderedSimpleTaskRunner::RunUntilIdle() {
   return RunTasksWhile(std::vector<base::Callback<bool(void)>>());
 }
 
 bool OrderedSimpleTaskRunner::RunUntilTime(base::TimeTicks time) {
   // If we are not auto advancing, force now forward to the time.
-  if (!advance_now_ && now_src_->Now() < time)
-    now_src_->SetNow(time);
+  if (!advance_now_ && now_src_->NowTicks() < time)
+    now_src_->Advance(time - now_src_->NowTicks());
 
   // Run tasks
   bool result = RunTasksWhile(NowBefore(time));
 
   // If the next task is after the stopping time and auto-advancing now, then
   // force time to be the stopping time.
-  if (!result && advance_now_ && now_src_->Now() < time) {
-    now_src_->SetNow(time);
+  if (!result && advance_now_ && now_src_->NowTicks() < time) {
+    now_src_->Advance(time - now_src_->NowTicks());
   }
 
   return result;
 }
 
 bool OrderedSimpleTaskRunner::RunForPeriod(base::TimeDelta period) {
-  return RunUntilTime(now_src_->Now() + period);
+  return RunUntilTime(now_src_->NowTicks() + period);
 }
 
 // base::trace_event tracing functionality
 scoped_refptr<base::trace_event::ConvertableToTraceFormat>
 OrderedSimpleTaskRunner::AsValue() const {
   scoped_refptr<base::trace_event::TracedValue> state =
       new base::trace_event::TracedValue();
   AsValueInto(state.get());
   return state;
 }
 
 void OrderedSimpleTaskRunner::AsValueInto(
     base::trace_event::TracedValue* state) const {
   state->SetInteger("pending_tasks", pending_tasks_.size());
 
   state->BeginArray("tasks");
   for (std::set<TestOrderablePendingTask>::const_iterator it =
            pending_tasks_.begin();
        it != pending_tasks_.end();
        ++it) {
     state->BeginDictionary();
     it->AsValueInto(state);
     state->EndDictionary();
   }
   state->EndArray();
 
   state->BeginDictionary("now_src");
-  now_src_->AsValueInto(state);
+  state->SetInteger("now_in_microseconds",

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

The internal value is not really defined to be in any known units, so it would
be better to do something like this:

state->SetDouble("now_in_ms", now_src->NowTicks().InMillisecondsF());

(Looks like we were already doing that before your patch too.)

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

This was replayed from TestNowSource.
base::TimeTicks does not define InMillisecondsF(). Unless we'd do
base::TimeDelta::FromMicroseconds(now_src_->NowTicks().ToInternalValue()).InMilliseconds()
which sounds effectively the same thing except explicitly converting to
milliseconds. Is that what is intended?

[Sami, 2015/06/09 10:16:02]

Oh right, with TimeTicks we usually do this:

    (ticks - base::TimeTicks()).InMillisecondsF()

I think that is preferable over using internal values.

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

Done.

+                    (now_src_->NowTicks()).ToInternalValue());
   state->EndDictionary();
 
   state->SetBoolean("advance_now", advance_now_);
   state->SetBoolean("inside_run_tasks_until", inside_run_tasks_until_);
   state->SetString("max_tasks", base::SizeTToString(max_tasks_));
 }
 
 base::Callback<bool(void)> OrderedSimpleTaskRunner::TaskRunCountBelow(
     size_t max_tasks) {
   return base::Bind(&OrderedSimpleTaskRunner::TaskRunCountBelowCallback,
@@ skipping 28 matching lines @@
   return NextTaskTime() <= stop_at;
 }
 
 base::Callback<bool(void)> OrderedSimpleTaskRunner::AdvanceNow() {
   return base::Bind(&OrderedSimpleTaskRunner::AdvanceNowCallback,
                     base::Unretained(this));
 }
 
 bool OrderedSimpleTaskRunner::AdvanceNowCallback() {
   base::TimeTicks next_task_time = NextTaskTime();
-  if (now_src_->Now() < next_task_time) {
-    now_src_->SetNow(next_task_time);
+  if (now_src_->NowTicks() < next_task_time) {
+    now_src_->Advance(next_task_time - now_src_->NowTicks());
   }
   return true;
 }
 
 }  // namespace cc