Index: components/scheduler/child/scheduler_helper.h |
diff --git a/components/scheduler/child/scheduler_helper.h b/components/scheduler/child/scheduler_helper.h |
index 241ae609d166f65e94f60378014a46c7e3e4d44f..aa9099bdabf6cfb462b2d60563be29ddea39c9ef 100644 |
--- a/components/scheduler/child/scheduler_helper.h |
+++ b/components/scheduler/child/scheduler_helper.h |
@@ -5,6 +5,7 @@ |
#ifndef COMPONENTS_SCHEDULER_CHILD_SCHEDULER_HELPER_H_ |
#define COMPONENTS_SCHEDULER_CHILD_SCHEDULER_HELPER_H_ |
+#include "base/time/tick_clock.h" |
#include "components/scheduler/base/task_queue_manager.h" |
#include "components/scheduler/base/task_queue_selector.h" |
#include "components/scheduler/scheduler_export.h" |
@@ -15,14 +16,14 @@ class TickClock; |
namespace scheduler { |
-class SchedulerTaskRunnerDelegate; |
+class SchedulerTqmDelegate; |
// Common scheduler functionality for default tasks. |
class SCHEDULER_EXPORT SchedulerHelper : public TaskQueueManager::Observer { |
public: |
// Category strings must have application lifetime (statics or |
// literals). They may not include " chars. |
- SchedulerHelper(scoped_refptr<SchedulerTaskRunnerDelegate> main_task_runner, |
+ SchedulerHelper(scoped_refptr<SchedulerTqmDelegate> main_task_runner, |
Sami
2015/10/30 14:09:50
Should we do a global rename of |main_task_runner|
alex clarke (OOO till 29th)
2015/10/30 16:02:00
Done.
|
const char* tracing_category, |
const char* disabled_by_default_tracing_category, |
const char* disabled_by_default_verbose_tracing_category); |
@@ -81,12 +82,11 @@ class SCHEDULER_EXPORT SchedulerHelper : public TaskQueueManager::Observer { |
void SetObserver(Observer* observer); |
// Accessor methods. |
- base::TimeTicks Now() const; |
+ base::TickClock* tick_clock() const; |
base::TimeTicks NextPendingDelayedTaskRunTime() const; |
bool GetAndClearSystemIsQuiescentBit(); |
// Test helpers. |
- void SetTimeSourceForTesting(scoped_ptr<base::TickClock> time_source); |
void SetWorkBatchSizeForTesting(size_t work_batch_size); |
TaskQueueManager* GetTaskQueueManagerForTesting(); |
@@ -94,14 +94,12 @@ class SCHEDULER_EXPORT SchedulerHelper : public TaskQueueManager::Observer { |
friend class SchedulerHelperTest; |
base::ThreadChecker thread_checker_; |
- scoped_refptr<SchedulerTaskRunnerDelegate> main_task_runner_; |
+ scoped_refptr<SchedulerTqmDelegate> main_task_runner_; |
scoped_ptr<TaskQueueManager> task_queue_manager_; |
scoped_refptr<TaskQueue> control_task_runner_; |
scoped_refptr<TaskQueue> control_after_wakeup_task_runner_; |
scoped_refptr<TaskQueue> default_task_runner_; |
- scoped_ptr<base::TickClock> time_source_; |
- |
Observer* observer_; // NOT OWNED |
const char* tracing_category_; |
const char* disabled_by_default_tracing_category_; |