Remove dependency on cc::TestNowSource from scheduler code

content/child/scheduler/task_queue_manager.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 CONTENT_RENDERER_SCHEDULER_TASK_QUEUE_MANAGER_H_
 #define CONTENT_RENDERER_SCHEDULER_TASK_QUEUE_MANAGER_H_
 
 #include "base/atomic_sequence_num.h"
 #include "base/debug/task_annotator.h"
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/pending_task.h"
 #include "base/single_thread_task_runner.h"
 #include "base/synchronization/lock.h"
 #include "base/threading/thread_checker.h"
 #include "content/child/scheduler/task_queue_selector.h"
+#include "content/child/scheduler/time_source.h"
 #include "content/common/content_export.h"
 
 namespace base {
 namespace trace_event {
 class ConvertableToTraceFormat;
 class TracedValue;
 }
 }
 
-namespace cc {
-class TestNowSource;
-}
-
 namespace content {
 namespace internal {
 class LazyNow;
 class TaskQueue;
 }
+class NestableSingleThreadTaskRunner;
 class TaskQueueSelector;
-class NestableSingleThreadTaskRunner;
+class TimeSource;
 
 // The task queue manager provides N task queues and a selector interface for
 // choosing which task queue to service next. Each task queue consists of two
 // sub queues:
 //
 // 1. Incoming task queue. Tasks that are posted get immediately appended here.
 //    When a task is appended into an empty incoming queue, the task manager
 //    work function (DoWork) is scheduled to run on the main task runner.
 //
 // 2. Work queue. If a work queue is empty when DoWork() is entered, tasks from
@@ skipping 69 matching lines @@
   // manager. Increasing the batch size can reduce the overhead of yielding
   // back to the main message loop -- at the cost of potentially delaying other
   // tasks posted to the main loop. The batch size is 1 by default.
   void SetWorkBatchSize(int work_batch_size);
 
   // These functions can only be called on the same thread that the task queue
   // manager executes its tasks on.
   void AddTaskObserver(base::MessageLoop::TaskObserver* task_observer);
   void RemoveTaskObserver(base::MessageLoop::TaskObserver* task_observer);
 
-  void SetTimeSourceForTesting(scoped_refptr<cc::TestNowSource> time_source);
+  void SetTimeSourceForTesting(scoped_ptr<TimeSource> time_source);

[Sami, 2015/04/20 18:38:35]

Passing the ownership here is a little odd since you then can't easily use the
same TimeSource with the TaskQueueManager and the Scheduler without having a
forwarding wrapper. However since this is just for tests I think this works fine
too.

 
   // Returns a bitmap where a bit is set iff a task on the corresponding queue
   // was run since the last call to GetAndClearTaskWasRunOnQueueBitmap.
   uint64 GetAndClearTaskWasRunOnQueueBitmap();
 
  private:
   // TaskQueueSelector::Observer implementation:
   void OnTaskQueueEnabled() override;
 
   friend class internal::LazyNow;
@@ skipping 66 matching lines @@
   base::Closure do_work_from_other_thread_closure_;
 
   uint64 task_was_run_bitmap_;
 
   // The pending_dowork_count_ is only tracked on the main thread since that's
   // where re-entrant problems happen.
   int pending_dowork_count_;
 
   int work_batch_size_;
 
-  scoped_refptr<cc::TestNowSource> time_source_;
+  scoped_ptr<TimeSource> time_source_;
 
   ObserverList<base::MessageLoop::TaskObserver> task_observers_;
 
   const char* disabled_by_default_tracing_category_;
 
   scoped_refptr<DeletionSentinel> deletion_sentinel_;
   base::WeakPtrFactory<TaskQueueManager> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(TaskQueueManager);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_SCHEDULER_TASK_QUEUE_MANAGER_H_