TaskScheduler: Remove base/task_scheduler/utils.h/.cc

base/task_scheduler/delayed_task_manager.cc

Index: base/task_scheduler/delayed_task_manager.cc
diff --git a/base/task_scheduler/delayed_task_manager.cc b/base/task_scheduler/delayed_task_manager.cc
index 1b2782965e3e8366bc459810c33899a8738d1188..0b8c2f9a4b7612c5bd25cd3fdc170f92e57f43c6 100644
--- a/base/task_scheduler/delayed_task_manager.cc
+++ b/base/task_scheduler/delayed_task_manager.cc
@@ -7,7 +7,7 @@
 #include <utility>
 
 #include "base/logging.h"
-#include "base/task_scheduler/scheduler_task_executor.h"
+#include "base/task_scheduler/scheduler_thread_pool.h"
 
 namespace base {
 namespace internal {
@@ -15,11 +15,11 @@ namespace internal {
 struct DelayedTaskManager::DelayedTask {
   DelayedTask(std::unique_ptr<Task> task,
               scoped_refptr<Sequence> sequence,
-              SchedulerTaskExecutor* executor,
+              SchedulerThreadPool* thread_pool,
               uint64_t index)
       : task(std::move(task)),
         sequence(std::move(sequence)),
-        executor(executor),
+        thread_pool(thread_pool),
         index(index) {}
 
   DelayedTask(DelayedTask&& other) = default;
@@ -28,11 +28,11 @@ struct DelayedTaskManager::DelayedTask {
 
   DelayedTask& operator=(DelayedTask&& other) = default;
 
-  // |task| will be posted to |executor| as part of |sequence| when it becomes
-  // ripe for execution.
+  // |task| will be posted to |thread_pool| as part of |sequence| when it
+  // becomes ripe for execution.
   std::unique_ptr<Task> task;
   scoped_refptr<Sequence> sequence;
-  SchedulerTaskExecutor* executor;
+  SchedulerThreadPool* thread_pool;
 
   // Ensures that tasks that have the same |delayed_run_time| are sorted
   // according to the order in which they were added to the DelayedTaskManager.
@@ -52,10 +52,10 @@ DelayedTaskManager::~DelayedTaskManager() = default;
 
 void DelayedTaskManager::AddDelayedTask(std::unique_ptr<Task> task,
                                         scoped_refptr<Sequence> sequence,
-                                        SchedulerTaskExecutor* executor) {
+                                        SchedulerThreadPool* thread_pool) {
   DCHECK(task);
   DCHECK(sequence);
-  DCHECK(executor);
+  DCHECK(thread_pool);
 
   const TimeTicks new_task_delayed_run_time = task->delayed_run_time;
   TimeTicks current_delayed_run_time;
@@ -66,7 +66,7 @@ void DelayedTaskManager::AddDelayedTask(std::unique_ptr<Task> task,
     if (!delayed_tasks_.empty())
       current_delayed_run_time = delayed_tasks_.top().task->delayed_run_time;
 
-    delayed_tasks_.emplace(std::move(task), std::move(sequence), executor,
+    delayed_tasks_.emplace(std::move(task), std::move(sequence), thread_pool,
                            ++delayed_task_index_);
   }
 
@@ -99,7 +99,7 @@ void DelayedTaskManager::PostReadyTasks() {
 
   // Post delayed tasks that are ready for execution.
   for (auto& delayed_task : ready_tasks) {
-    delayed_task.executor->PostTaskWithSequence(
+    delayed_task.thread_pool->PostTaskWithSequenceNow(
         std::move(delayed_task.task), std::move(delayed_task.sequence));
   }
 }