Rename WorkerSchedulerHelper to NonMainThreadSchedulerHelper.

The class now supports NonMainThreadScheduler, so its name should also
be changed. File names are also updated.

Bug: 826203
Change-Id: I49c08a359db10d28db5db434b8db5e5b0c985e6f
Reviewed-on: https://chromium-review.googlesource.com/1011862Reviewed-by: Kentaro Hara <haraken@chromium.org>
Reviewed-by: Alexander Timin <altimin@chromium.org>
Commit-Queue: Yuta Kitamura <yutak@chromium.org>
Cr-Commit-Position: refs/heads/master@{#550548}

third_party/blink/renderer/platform/scheduler/BUILD.gn

@@ -58,8 +58,6 @@ blink_platform_sources("scheduler") {
     "child/pollable_thread_safe_flag.h",
     "child/process_state.cc",
     "child/process_state.h",
-    "common/scheduler_helper.cc",
-    "common/scheduler_helper.h",
     "child/single_thread_idle_task_runner.cc",
     "child/task_runner_impl.cc",
     "child/task_runner_impl.h",
@@ -73,12 +71,12 @@ blink_platform_sources("scheduler") {
     "child/worker_global_scope_scheduler.h",
     "child/worker_metrics_helper.cc",
     "child/worker_metrics_helper.h",
-    "worker/worker_scheduler_helper.cc",
-    "worker/worker_scheduler_helper.h",
     "child/worker_scheduler_proxy.cc",
     "child/worker_scheduler_proxy.h",
     "child/worker_task_queue.cc",
     "child/worker_task_queue.h",
+    "common/scheduler_helper.cc",
+    "common/scheduler_helper.h",
     "common/throttling/budget_pool.cc",
     "common/throttling/budget_pool.h",
     "common/throttling/cpu_time_budget_pool.cc",
@@ -93,6 +91,8 @@ blink_platform_sources("scheduler") {
     "main_thread/frame_origin_type.h",
     "main_thread/frame_scheduler_impl.cc",
     "main_thread/frame_scheduler_impl.h",
+    "main_thread/main_thread_scheduler_helper.cc",
+    "main_thread/main_thread_scheduler_helper.h",
     "main_thread/main_thread_scheduler_impl.cc",
     "main_thread/main_thread_scheduler_impl.h",
     "main_thread/page_scheduler_impl.cc",
@@ -112,8 +112,6 @@ blink_platform_sources("scheduler") {
     "renderer/frame_status.h",
     "renderer/idle_time_estimator.cc",
     "renderer/idle_time_estimator.h",
-    "main_thread/main_thread_scheduler_helper.cc",
-    "main_thread/main_thread_scheduler_helper.h",
     "renderer/main_thread_task_queue.cc",
     "renderer/main_thread_task_queue.h",
     "renderer/queueing_time_estimator.cc",
@@ -146,6 +144,8 @@ blink_platform_sources("scheduler") {
     "worker/compositor_thread_scheduler.cc",
     "worker/compositor_thread_scheduler.h",
     "worker/non_main_thread_scheduler.cc",
+    "worker/non_main_thread_scheduler_helper.cc",
+    "worker/non_main_thread_scheduler_helper.h",
     "worker/worker_thread_scheduler.cc",
     "worker/worker_thread_scheduler.h",
   ]
@@ -202,10 +202,10 @@ jumbo_source_set("unit_tests") {
     "child/idle_canceled_delayed_task_sweeper_unittest.cc",
     "child/idle_helper_unittest.cc",
     "child/metrics_helper_unittest.cc",
-    "common/scheduler_helper_unittest.cc",
     "child/webthread_impl_for_worker_scheduler_unittest.cc",
     "child/worker_global_scope_scheduler_unittest.cc",
     "child/worker_scheduler_proxy_unittest.cc",
+    "common/scheduler_helper_unittest.cc",
     "common/throttling/budget_pool_unittest.cc",
     "common/throttling/task_queue_throttler_unittest.cc",
     "main_thread/frame_scheduler_impl_unittest.cc",

third_party/blink/renderer/platform/scheduler/child/idle_helper_unittest.cc

@@ -19,8 +19,8 @@
 #include "third_party/blink/renderer/platform/scheduler/base/task_queue.h"
 #include "third_party/blink/renderer/platform/scheduler/base/task_queue_manager.h"
 #include "third_party/blink/renderer/platform/scheduler/common/scheduler_helper.h"
-#include "third_party/blink/renderer/platform/scheduler/worker/worker_scheduler_helper.h"
 #include "third_party/blink/renderer/platform/scheduler/test/task_queue_manager_for_test.h"
+#include "third_party/blink/renderer/platform/scheduler/worker/non_main_thread_scheduler_helper.h"
 
 using testing::_;
 using testing::AnyNumber;
@@ -202,7 +202,7 @@ class BaseIdleHelperTest : public testing::Test {
             message_loop ? message_loop->task_runner() : mock_task_runner_,
             &clock_);
     task_queue_manager_ = task_queue_manager.get();
-    scheduler_helper_ = std::make_unique<WorkerSchedulerHelper>(
+    scheduler_helper_ = std::make_unique<NonMainThreadSchedulerHelper>(
         std::move(task_queue_manager), nullptr);
     idle_helper_ = std::make_unique<IdleHelperForTest>(
         scheduler_helper_.get(),
@@ -306,7 +306,7 @@ class BaseIdleHelperTest : public testing::Test {
   scoped_refptr<cc::OrderedSimpleTaskRunner> mock_task_runner_;
   std::unique_ptr<base::MessageLoop> message_loop_;
 
-  std::unique_ptr<WorkerSchedulerHelper> scheduler_helper_;
+  std::unique_ptr<NonMainThreadSchedulerHelper> scheduler_helper_;
   TaskQueueManager* task_queue_manager_;  // Owned by scheduler_helper_.
   std::unique_ptr<IdleHelperForTest> idle_helper_;
   scoped_refptr<base::SingleThreadTaskRunner> default_task_runner_;

third_party/blink/renderer/platform/scheduler/common/scheduler_helper_unittest.cc

@@ -14,8 +14,8 @@
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/blink/renderer/platform/scheduler/base/lazy_now.h"
 #include "third_party/blink/renderer/platform/scheduler/base/task_queue.h"
-#include "third_party/blink/renderer/platform/scheduler/worker/worker_scheduler_helper.h"
 #include "third_party/blink/renderer/platform/scheduler/test/task_queue_manager_for_test.h"
+#include "third_party/blink/renderer/platform/scheduler/worker/non_main_thread_scheduler_helper.h"
 
 using testing::_;
 using testing::AnyNumber;
@@ -54,7 +54,7 @@ class SchedulerHelperTest : public testing::Test {
     std::unique_ptr<TaskQueueManagerForTest> task_queue_manager =
         TaskQueueManagerForTest::Create(nullptr, mock_task_runner_, &clock_);
     task_queue_manager_ = task_queue_manager.get();
-    scheduler_helper_ = std::make_unique<WorkerSchedulerHelper>(
+    scheduler_helper_ = std::make_unique<NonMainThreadSchedulerHelper>(
         std::move(task_queue_manager), nullptr);
     default_task_runner_ = scheduler_helper_->DefaultWorkerTaskQueue();
     clock_.Advance(base::TimeDelta::FromMicroseconds(5000));
@@ -85,7 +85,7 @@ class SchedulerHelperTest : public testing::Test {
   base::SimpleTestTickClock clock_;
   scoped_refptr<cc::OrderedSimpleTaskRunner> mock_task_runner_;
 
-  std::unique_ptr<WorkerSchedulerHelper> scheduler_helper_;
+  std::unique_ptr<NonMainThreadSchedulerHelper> scheduler_helper_;
   TaskQueueManagerForTest* task_queue_manager_;  // Owned by scheduler_helper.
   scoped_refptr<base::SingleThreadTaskRunner> default_task_runner_;
 

third_party/blink/renderer/platform/scheduler/public/non_main_thread_scheduler.h

@@ -14,8 +14,8 @@
 #include "third_party/blink/public/platform/web_thread_type.h"
 #include "third_party/blink/renderer/platform/platform_export.h"
 #include "third_party/blink/renderer/platform/scheduler/base/task_queue.h"
-#include "third_party/blink/renderer/platform/scheduler/worker/worker_scheduler_helper.h"
 #include "third_party/blink/renderer/platform/scheduler/child/worker_task_queue.h"
+#include "third_party/blink/renderer/platform/scheduler/worker/non_main_thread_scheduler_helper.h"
 
 namespace blink {
 namespace scheduler {
@@ -47,9 +47,9 @@ class PLATFORM_EXPORT NonMainThreadScheduler : public WebThreadScheduler {
 
  protected:
   explicit NonMainThreadScheduler(
-      std::unique_ptr<WorkerSchedulerHelper> helper);
+      std::unique_ptr<NonMainThreadSchedulerHelper> helper);
 
-  std::unique_ptr<WorkerSchedulerHelper> helper_;
+  std::unique_ptr<NonMainThreadSchedulerHelper> helper_;
 
   DISALLOW_COPY_AND_ASSIGN(NonMainThreadScheduler);
 };

third_party/blink/renderer/platform/scheduler/renderer/auto_advancing_virtual_time_domain_unittest.cc

@@ -11,9 +11,9 @@
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/blink/renderer/platform/scheduler/base/task_queue_manager.h"
 #include "third_party/blink/renderer/platform/scheduler/base/test_task_time_observer.h"
-#include "third_party/blink/renderer/platform/scheduler/worker/worker_scheduler_helper.h"
 #include "third_party/blink/renderer/platform/scheduler/test/task_queue_manager_for_test.h"
 #include "third_party/blink/renderer/platform/scheduler/test/test_task_queue.h"
+#include "third_party/blink/renderer/platform/scheduler/worker/non_main_thread_scheduler_helper.h"
 
 namespace blink {
 namespace scheduler {
@@ -31,7 +31,7 @@ class AutoAdvancingVirtualTimeDomainTest : public testing::Test {
     mock_task_runner_ =
         base::MakeRefCounted<cc::OrderedSimpleTaskRunner>(&clock_, false);
 
-    scheduler_helper_.reset(new WorkerSchedulerHelper(
+    scheduler_helper_.reset(new NonMainThreadSchedulerHelper(
         TaskQueueManagerForTest::Create(nullptr, mock_task_runner_, &clock_),
         nullptr));
 
@@ -55,7 +55,7 @@ class AutoAdvancingVirtualTimeDomainTest : public testing::Test {
   base::TimeTicks initial_time_ticks_;
   base::SimpleTestTickClock clock_;
   scoped_refptr<cc::OrderedSimpleTaskRunner> mock_task_runner_;
-  std::unique_ptr<WorkerSchedulerHelper> scheduler_helper_;
+  std::unique_ptr<NonMainThreadSchedulerHelper> scheduler_helper_;
   scoped_refptr<TaskQueue> task_queue_;
   std::unique_ptr<AutoAdvancingVirtualTimeDomain> auto_advancing_time_domain_;
   TestTaskTimeObserver test_task_time_observer_;

third_party/blink/renderer/platform/scheduler/worker/compositor_thread_scheduler.cc

@@ -20,8 +20,8 @@ namespace scheduler {
 CompositorThreadScheduler::CompositorThreadScheduler(
     base::Thread* thread,
     std::unique_ptr<TaskQueueManager> task_queue_manager)
-    : NonMainThreadScheduler(
-          std::make_unique<WorkerSchedulerHelper>(std::move(task_queue_manager),
+    : NonMainThreadScheduler(std::make_unique<NonMainThreadSchedulerHelper>(
+          std::move(task_queue_manager),
           this)),
       thread_(thread) {}
 

third_party/blink/renderer/platform/scheduler/worker/non_main_thread_scheduler.cc

@@ -13,7 +13,7 @@ namespace blink {
 namespace scheduler {
 
 NonMainThreadScheduler::NonMainThreadScheduler(
-    std::unique_ptr<WorkerSchedulerHelper> helper)
+    std::unique_ptr<NonMainThreadSchedulerHelper> helper)
     : helper_(std::move(helper)) {}
 
 NonMainThreadScheduler::~NonMainThreadScheduler() = default;

third_party/blink/renderer/platform/scheduler/worker/worker_scheduler_helper.cc → third_party/blink/renderer/platform/scheduler/worker/non_main_thread_scheduler_helper.cc

@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "third_party/blink/renderer/platform/scheduler/worker/worker_scheduler_helper.h"
+#include "third_party/blink/renderer/platform/scheduler/worker/non_main_thread_scheduler_helper.h"
 
 #include "third_party/blink/renderer/platform/scheduler/child/worker_task_queue.h"
 
 namespace blink {
 namespace scheduler {
 
-WorkerSchedulerHelper::WorkerSchedulerHelper(
+NonMainThreadSchedulerHelper::NonMainThreadSchedulerHelper(
     std::unique_ptr<TaskQueueManager> task_queue_manager,
     NonMainThreadScheduler* non_main_thread_scheduler)
     : SchedulerHelper(std::move(task_queue_manager)),
@@ -21,28 +21,30 @@ WorkerSchedulerHelper::WorkerSchedulerHelper(
   InitDefaultQueues(default_task_queue_, control_task_queue_);
 }
 
-WorkerSchedulerHelper::~WorkerSchedulerHelper() {
+NonMainThreadSchedulerHelper::~NonMainThreadSchedulerHelper() {
   control_task_queue_->ShutdownTaskQueue();
   default_task_queue_->ShutdownTaskQueue();
 }
 
-scoped_refptr<WorkerTaskQueue> WorkerSchedulerHelper::DefaultWorkerTaskQueue() {
+scoped_refptr<WorkerTaskQueue>
+NonMainThreadSchedulerHelper::DefaultWorkerTaskQueue() {
   return default_task_queue_;
 }
 
-scoped_refptr<TaskQueue> WorkerSchedulerHelper::DefaultTaskQueue() {
+scoped_refptr<TaskQueue> NonMainThreadSchedulerHelper::DefaultTaskQueue() {
   return default_task_queue_;
 }
 
-scoped_refptr<WorkerTaskQueue> WorkerSchedulerHelper::ControlWorkerTaskQueue() {
+scoped_refptr<WorkerTaskQueue>
+NonMainThreadSchedulerHelper::ControlWorkerTaskQueue() {
   return control_task_queue_;
 }
 
-scoped_refptr<TaskQueue> WorkerSchedulerHelper::ControlTaskQueue() {
+scoped_refptr<TaskQueue> NonMainThreadSchedulerHelper::ControlTaskQueue() {
   return control_task_queue_;
 }
 
-scoped_refptr<WorkerTaskQueue> WorkerSchedulerHelper::NewTaskQueue(
+scoped_refptr<WorkerTaskQueue> NonMainThreadSchedulerHelper::NewTaskQueue(
     const TaskQueue::Spec& spec) {
   return task_queue_manager_->CreateTaskQueue<WorkerTaskQueue>(
       spec, non_main_thread_scheduler_);

third_party/blink/renderer/platform/scheduler/worker/worker_scheduler_helper.h → third_party/blink/renderer/platform/scheduler/worker/non_main_thread_scheduler_helper.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef THIRD_PARTY_BLINK_RENDERER_PLATFORM_SCHEDULER_WORKER_WORKER_SCHEDULER_HELPER_H_
-#define THIRD_PARTY_BLINK_RENDERER_PLATFORM_SCHEDULER_WORKER_WORKER_SCHEDULER_HELPER_H_
+#ifndef THIRD_PARTY_BLINK_RENDERER_PLATFORM_SCHEDULER_WORKER_NON_MAIN_THREAD_SCHEDULER_HELPER_H_
+#define THIRD_PARTY_BLINK_RENDERER_PLATFORM_SCHEDULER_WORKER_NON_MAIN_THREAD_SCHEDULER_HELPER_H_
 
 #include "third_party/blink/renderer/platform/scheduler/common/scheduler_helper.h"
 
@@ -14,11 +14,12 @@ namespace scheduler {
 
 class NonMainThreadScheduler;
 
-class PLATFORM_EXPORT WorkerSchedulerHelper : public SchedulerHelper {
+class PLATFORM_EXPORT NonMainThreadSchedulerHelper : public SchedulerHelper {
  public:
-  WorkerSchedulerHelper(std::unique_ptr<TaskQueueManager> manager,
+  NonMainThreadSchedulerHelper(
+      std::unique_ptr<TaskQueueManager> manager,
       NonMainThreadScheduler* non_main_thread_scheduler);
-  ~WorkerSchedulerHelper() override;
+  ~NonMainThreadSchedulerHelper() override;
 
   scoped_refptr<WorkerTaskQueue> NewTaskQueue(const TaskQueue::Spec& spec);
 
@@ -34,10 +35,10 @@ class PLATFORM_EXPORT WorkerSchedulerHelper : public SchedulerHelper {
   const scoped_refptr<WorkerTaskQueue> default_task_queue_;
   const scoped_refptr<WorkerTaskQueue> control_task_queue_;
 
-  DISALLOW_COPY_AND_ASSIGN(WorkerSchedulerHelper);
+  DISALLOW_COPY_AND_ASSIGN(NonMainThreadSchedulerHelper);
 };
 
 }  // namespace scheduler
 }  // namespace blink
 
-#endif  // THIRD_PARTY_BLINK_RENDERER_PLATFORM_SCHEDULER_WORKER_WORKER_SCHEDULER_HELPER_H_
+#endif  // THIRD_PARTY_BLINK_RENDERER_PLATFORM_SCHEDULER_WORKER_NON_MAIN_THREAD_SCHEDULER_HELPER_H_

third_party/blink/renderer/platform/scheduler/worker/worker_thread_scheduler.cc

@@ -15,8 +15,8 @@
 #include "third_party/blink/renderer/platform/scheduler/base/task_queue.h"
 #include "third_party/blink/renderer/platform/scheduler/base/task_queue_manager.h"
 #include "third_party/blink/renderer/platform/scheduler/child/default_params.h"
-#include "third_party/blink/renderer/platform/scheduler/worker/worker_scheduler_helper.h"
 #include "third_party/blink/renderer/platform/scheduler/child/worker_scheduler_proxy.h"
+#include "third_party/blink/renderer/platform/scheduler/worker/non_main_thread_scheduler_helper.h"
 
 namespace blink {
 namespace scheduler {
@@ -49,8 +49,8 @@ WorkerThreadScheduler::WorkerThreadScheduler(
     WebThreadType thread_type,
     std::unique_ptr<TaskQueueManager> task_queue_manager,
     WorkerSchedulerProxy* proxy)
-    : NonMainThreadScheduler(
-          std::make_unique<WorkerSchedulerHelper>(std::move(task_queue_manager),
+    : NonMainThreadScheduler(std::make_unique<NonMainThreadSchedulerHelper>(
+          std::move(task_queue_manager),
           this)),
       idle_helper_(helper_.get(),
                    this,