Replaced TestNowSource with SimpleTestTickClock.

cc/test/ordered_simple_task_runner.h

 // 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.
 
 #ifndef CC_TEST_ORDERED_SIMPLE_TASK_RUNNER_H_
 #define CC_TEST_ORDERED_SIMPLE_TASK_RUNNER_H_
 
 #include <limits>
 #include <set>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/logging.h"
+#include "base/test/simple_test_tick_clock.h"
 #include "base/test/test_simple_task_runner.h"
 #include "base/trace_event/trace_event.h"
-#include "cc/test/test_now_source.h"
 
 namespace cc {
 
 // Subclass of TestPendingTask which has a unique ID for every task, supports
 // being used inside a std::set and has debug tracing support.
 class TestOrderablePendingTask : public base::TestPendingTask {
  public:
   TestOrderablePendingTask();
   TestOrderablePendingTask(const tracked_objects::Location& location,
                            const base::Closure& task,
@@ skipping 14 matching lines @@
   static size_t task_id_counter;
   const size_t task_id_;
 };
 
 // This runs pending tasks based on task's post_time + delay.
 // We should not execute a delayed task sooner than some of the queued tasks
 // which don't have a delay even though it is queued early.
 class OrderedSimpleTaskRunner : public base::SingleThreadTaskRunner {
  public:
   OrderedSimpleTaskRunner();
-  OrderedSimpleTaskRunner(scoped_refptr<TestNowSource> now_src,
-                          bool advance_now);
+  OrderedSimpleTaskRunner(base::SimpleTestTickClock* now_src, bool advance_now);
 
   // base::TestSimpleTaskRunner implementation:
   bool PostDelayedTask(const tracked_objects::Location& from_here,
                        const base::Closure& task,
                        base::TimeDelta delay) override;
   bool PostNonNestableDelayedTask(const tracked_objects::Location& from_here,
                                   const base::Closure& task,
                                   base::TimeDelta delay) override;
 
   bool RunsTasksOnCurrentThread() const override;
 
+  static const base::TimeTicks kAbsoluteMaxNow;
+
   // Set a maximum number of tasks to run at once. Useful as a timeout to
   // prevent infinite task loops.
   static const size_t kAbsoluteMaxTasks;
   void SetRunTaskLimit(size_t max_tasks) { max_tasks_ = max_tasks; }
   void ClearRunTaskLimit() { max_tasks_ = kAbsoluteMaxTasks; }
 
   // Allow task runner to advance now when running tasks.
   void SetAutoAdvanceNowToPendingTasks(bool advance_now) {
     advance_now_ = advance_now;
   }
@@ skipping 56 matching lines @@
   bool TaskExistedInitiallyCallback(
       const std::set<TestOrderablePendingTask>& existing_tasks);
   bool NowBeforeCallback(base::TimeTicks stop_at);
   bool AdvanceNowCallback();
 
   ~OrderedSimpleTaskRunner() override;
 
   base::ThreadChecker thread_checker_;
 
   bool advance_now_;
-  scoped_refptr<TestNowSource> now_src_;
+  base::SimpleTestTickClock* now_src_;

[Sami, 2015/06/05 17:11:07]

Who owns this object? One of the constructors takes it from the caller and the
other allocates a new one but never frees it. I think we only want one of these
options.

[Ankur Verma, 2015/06/08 07:11:34]

Done. Removed the ctor which allocated but never freed. Updated caller with a
scoped clock (SurfaceDisplayOutputSurfaceTest())

 
   size_t max_tasks_;
 
   bool inside_run_tasks_until_;
   std::set<TestOrderablePendingTask> pending_tasks_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(OrderedSimpleTaskRunner);
 };
 
 }  // namespace cc
 
 #endif  // CC_TEST_ORDERED_SIMPLE_TASK_RUNNER_H_