Move TaskQueue header to //base/task/sequence_manager.

Bug: 783309
Change-Id: I4572bf52fb31840cdb6006d8821bc29c2fd071f3
Reviewed-on: https://chromium-review.googlesource.com/1079567
Commit-Queue: Greg Kraynov <kraynov@chromium.org>
Reviewed-by: Gabriel Charette <gab@chromium.org>
Reviewed-by: Alexander Timin <altimin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#565677}

base/BUILD.gn

@@ -813,6 +813,7 @@ jumbo_component("base") {
     "task/sequence_manager/lazy_now.cc",
     "task/sequence_manager/lazy_now.h",
     "task/sequence_manager/sequenced_task_source.h",
+    "task/sequence_manager/task_queue.h",
     "task/sequence_manager/thread_controller.h",
     "task_runner.cc",
     "task_runner.h",

third_party/blink/renderer/platform/scheduler/base/moveable_auto_lock.h → base/task/sequence_manager/moveable_auto_lock.h

-// Copyright 2016 The Chromium Authors. All rights reserved.
+// Copyright 2018 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 THIRD_PARTY_BLINK_RENDERER_PLATFORM_SCHEDULER_BASE_MOVEABLE_AUTO_LOCK_H_
-#define THIRD_PARTY_BLINK_RENDERER_PLATFORM_SCHEDULER_BASE_MOVEABLE_AUTO_LOCK_H_
+#ifndef BASE_TASK_SEQUENCE_MANAGER_MOVEABLE_AUTO_LOCK_H_
+#define BASE_TASK_SEQUENCE_MANAGER_MOVEABLE_AUTO_LOCK_H_
 
 #include "base/synchronization/lock.h"
 
@@ -16,7 +16,7 @@ class MoveableAutoLock {
     lock_.Acquire();
   }
 
-  MoveableAutoLock(MoveableAutoLock&& other)
+  MoveableAutoLock(MoveableAutoLock&& other) noexcept
       : lock_(other.lock_), moved_(other.moved_) {
     lock_.AssertAcquired();
     other.moved_ = true;
@@ -38,4 +38,4 @@ class MoveableAutoLock {
 }  // namespace sequence_manager
 }  // namespace base
 
-#endif  // THIRD_PARTY_BLINK_RENDERER_PLATFORM_SCHEDULER_BASE_MOVEABLE_AUTO_LOCK_H_
+#endif  // BASE_TASK_SEQUENCE_MANAGER_MOVEABLE_AUTO_LOCK_H_

third_party/blink/renderer/platform/scheduler/base/task_queue.h → base/task/sequence_manager/task_queue.h

-// Copyright 2015 The Chromium Authors. All rights reserved.
+// Copyright 2018 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 THIRD_PARTY_BLINK_RENDERER_PLATFORM_SCHEDULER_BASE_TASK_QUEUE_H_
-#define THIRD_PARTY_BLINK_RENDERER_PLATFORM_SCHEDULER_BASE_TASK_QUEUE_H_
+#ifndef BASE_TASK_SEQUENCE_MANAGER_TASK_QUEUE_H_
+#define BASE_TASK_SEQUENCE_MANAGER_TASK_QUEUE_H_
 
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
@@ -11,31 +11,37 @@
 #include "base/optional.h"
 #include "base/single_thread_task_runner.h"
 #include "base/synchronization/lock.h"
+#include "base/task/sequence_manager/moveable_auto_lock.h"
 #include "base/threading/platform_thread.h"
 #include "base/time/time.h"
-#include "third_party/blink/renderer/platform/platform_export.h"
-#include "third_party/blink/renderer/platform/scheduler/base/graceful_queue_shutdown_helper.h"
-#include "third_party/blink/renderer/platform/scheduler/base/moveable_auto_lock.h"
+
+// Currently the implementation is located in Blink because scheduler/base move
+// is in progress https://crbug.com/783309.
+// TODO(kraynov): Remove this hack ASAP.
+#ifndef HACKDEF_INCLUDED_FROM_BLINK
+// Need PLATFORM_EXPORT macro.
+#error Use third_party/blink/renderer/platform/scheduler/base/task_queue_forward.h.
+#endif
 
 namespace base {
+
 namespace trace_event {
 class BlameContext;
 }
-}  // namespace base
 
-namespace base {
 namespace sequence_manager {
 
 namespace internal {
 class TaskQueueImpl;
-}
+class GracefulQueueShutdownHelper;
+}  // namespace internal
 
 class TimeDomain;
 class TaskQueueManagerImpl;
 
 class PLATFORM_EXPORT TaskQueue : public SingleThreadTaskRunner {
  public:
-  class PLATFORM_EXPORT Observer {
+  class Observer {
    public:
     virtual ~Observer() = default;
 
@@ -71,10 +77,12 @@ class PLATFORM_EXPORT TaskQueue : public SingleThreadTaskRunner {
     int task_type;
   };
 
-  // Unregisters the task queue after which no tasks posted to it will run and
-  // the TaskQueueManagerImpl's reference to it will be released soon.
+  // Prepare the task queue to get released.
+  // All tasks posted after this call will be discarded.
   virtual void ShutdownTaskQueue();
 
+  // TODO(scheduler-dev): Could we define a more clear list of priorities?
+  // See https://crbug.com/847858.
   enum QueuePriority {
     // Queues with control priority will run before any other queue, and will
     // explicitly starve other queues. Typically this should only be used for
@@ -183,8 +191,8 @@ class PLATFORM_EXPORT TaskQueue : public SingleThreadTaskRunner {
   bool HasTaskToRunImmediately() const;
 
   // Returns requested run time of next scheduled wake-up for a delayed task
-  // which is not ready to run. If there are no such tasks or the queue is
-  // disabled (by a QueueEnabledVoter) it returns nullopt.
+  // which is not ready to run. If there are no such tasks (immediate tasks
+  // don't count) or the queue is disabled it returns nullopt.
   // NOTE: this must be called on the thread this TaskQueue was created by.
   Optional<TimeTicks> GetNextScheduledWakeUp();
 
@@ -244,6 +252,9 @@ class PLATFORM_EXPORT TaskQueue : public SingleThreadTaskRunner {
   // blocked by it.
   void RemoveFence();
 
+  // Returns true if the queue has a fence but it isn't necessarily blocking
+  // execution of tasks (it may be the case if tasks enqueue order hasn't
+  // reached the number set for a fence).
   bool HasActiveFence();
 
   // Returns true if the queue has a fence which is blocking execution of tasks.
@@ -277,7 +288,10 @@ class PLATFORM_EXPORT TaskQueue : public SingleThreadTaskRunner {
 
   Optional<MoveableAutoLock> AcquireImplReadLockIfNeeded() const;
 
-  // Take |impl_| and untie it from the enclosing task queue.
+  // TaskQueue has ownership of an underlying implementation but in certain
+  // cases (e.g. detached frames) their lifetime may diverge.
+  // This method should be used to take away the impl for graceful shutdown.
+  // TaskQueue will disregard any calls or posting tasks thereafter.
   std::unique_ptr<internal::TaskQueueImpl> TakeTaskQueueImpl();
 
   // |impl_| can be written to on the main thread but can be read from
@@ -303,4 +317,4 @@ class PLATFORM_EXPORT TaskQueue : public SingleThreadTaskRunner {
 }  // namespace sequence_manager
 }  // namespace base
 
-#endif  // THIRD_PARTY_BLINK_RENDERER_PLATFORM_SCHEDULER_BASE_TASK_QUEUE_H_
+#endif  // BASE_TASK_SEQUENCE_MANAGER_TASK_QUEUE_H_

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

@@ -13,11 +13,10 @@ blink_platform_sources("scheduler") {
     "base/graceful_queue_shutdown_helper.h",
     "base/intrusive_heap.h",
     "base/lazily_deallocated_deque.h",
-    "base/moveable_auto_lock.h",
     "base/real_time_domain.cc",
     "base/real_time_domain.h",
     "base/task_queue.cc",
-    "base/task_queue.h",
+    "base/task_queue_forward.h",
     "base/task_queue_impl.cc",
     "base/task_queue_impl.h",
     "base/task_queue_manager.h",

third_party/blink/renderer/platform/scheduler/base/task_queue.cc

@@ -2,7 +2,7 @@
 // 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/base/task_queue.h"
+#include "third_party/blink/renderer/platform/scheduler/base/task_queue_forward.h"
 
 #include "base/bind_helpers.h"
 #include "base/optional.h"

third_party/blink/renderer/platform/scheduler/base/task_queue_forward.h

+// Copyright 2018 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 THIRD_PARTY_BLINK_RENDERER_PLATFORM_SCHEDULER_BASE_TASK_QUEUE_FORWARD_H_
+#define THIRD_PARTY_BLINK_RENDERER_PLATFORM_SCHEDULER_BASE_TASK_QUEUE_FORWARD_H_
+
+// Currently the implementation is located in Blink because scheduler/base move
+// is in progress https://crbug.com/783309.
+// TODO(kraynov): Remove this header after the move.
+
+// Must be included first.
+#include "third_party/blink/renderer/platform/platform_export.h"
+
+#define HACKDEF_INCLUDED_FROM_BLINK
+#include "base/task/sequence_manager/task_queue.h"
+#undef HACKDEF_INCLUDED_FROM_BLINK
+
+#endif  // THIRD_PARTY_BLINK_RENDERER_PLATFORM_SCHEDULER_BASE_TASK_QUEUE_FORWARD_H_

third_party/blink/renderer/platform/scheduler/base/task_queue_impl.h

@@ -23,7 +23,7 @@
 #include "third_party/blink/renderer/platform/scheduler/base/graceful_queue_shutdown_helper.h"
 #include "third_party/blink/renderer/platform/scheduler/base/intrusive_heap.h"
 #include "third_party/blink/renderer/platform/scheduler/base/lazily_deallocated_deque.h"
-#include "third_party/blink/renderer/platform/scheduler/base/task_queue.h"
+#include "third_party/blink/renderer/platform/scheduler/base/task_queue_forward.h"
 
 namespace base {
 namespace sequence_manager {

third_party/blink/renderer/platform/scheduler/base/task_queue_manager_impl.h

@@ -25,11 +25,11 @@
 #include "base/run_loop.h"
 #include "base/single_thread_task_runner.h"
 #include "base/synchronization/lock.h"
+#include "base/task/sequence_manager/moveable_auto_lock.h"
 #include "base/task/sequence_manager/thread_controller.h"
 #include "base/threading/thread_checker.h"
 #include "third_party/blink/renderer/platform/scheduler/base/enqueue_order.h"
 #include "third_party/blink/renderer/platform/scheduler/base/graceful_queue_shutdown_helper.h"
-#include "third_party/blink/renderer/platform/scheduler/base/moveable_auto_lock.h"
 #include "third_party/blink/renderer/platform/scheduler/base/task_queue_impl.h"
 #include "third_party/blink/renderer/platform/scheduler/base/task_queue_manager.h"
 #include "third_party/blink/renderer/platform/scheduler/base/task_queue_selector.h"

third_party/blink/renderer/platform/scheduler/base/test/test_task_queue.h

@@ -6,7 +6,7 @@
 #define THIRD_PARTY_BLINK_RENDERER_PLATFORM_SCHEDULER_BASE_TEST_TEST_TASK_QUEUE_H_
 
 #include "base/memory/weak_ptr.h"
-#include "third_party/blink/renderer/platform/scheduler/base/task_queue.h"
+#include "third_party/blink/renderer/platform/scheduler/base/task_queue_forward.h"
 
 namespace base {
 namespace sequence_manager {

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

@@ -8,7 +8,7 @@
 
 #include "base/bind.h"
 #include "base/location.h"
-#include "third_party/blink/renderer/platform/scheduler/base/task_queue.h"
+#include "third_party/blink/renderer/platform/scheduler/base/task_queue_forward.h"
 
 namespace blink {
 namespace scheduler {

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

@@ -11,7 +11,7 @@
 #include "base/synchronization/waitable_event.h"
 #include "base/time/default_tick_clock.h"
 #include "third_party/blink/public/platform/task_type.h"
-#include "third_party/blink/renderer/platform/scheduler/base/task_queue.h"
+#include "third_party/blink/renderer/platform/scheduler/base/task_queue_forward.h"
 #include "third_party/blink/renderer/platform/scheduler/child/task_queue_with_task_type.h"
 #include "third_party/blink/renderer/platform/scheduler/worker/worker_scheduler_proxy.h"
 #include "third_party/blink/renderer/platform/scheduler/worker/worker_thread_scheduler.h"

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

@@ -8,7 +8,7 @@
 #include "base/test/simple_test_tick_clock.h"
 #include "components/viz/test/ordered_simple_task_runner.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "third_party/blink/renderer/platform/scheduler/base/task_queue.h"
+#include "third_party/blink/renderer/platform/scheduler/base/task_queue_forward.h"
 #include "third_party/blink/renderer/platform/scheduler/base/test/task_queue_manager_for_test.h"
 #include "third_party/blink/renderer/platform/scheduler/common/idle_helper.h"
 #include "third_party/blink/renderer/platform/scheduler/common/scheduler_helper.h"

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

@@ -8,7 +8,7 @@
 #include "base/trace_event/trace_event.h"
 #include "base/trace_event/trace_event_argument.h"
 #include "third_party/blink/renderer/platform/scheduler/base/real_time_domain.h"
-#include "third_party/blink/renderer/platform/scheduler/base/task_queue.h"
+#include "third_party/blink/renderer/platform/scheduler/base/task_queue_forward.h"
 #include "third_party/blink/renderer/platform/scheduler/base/task_queue_manager.h"
 #include "third_party/blink/renderer/platform/scheduler/child/task_queue_with_task_type.h"
 #include "third_party/blink/renderer/platform/scheduler/common/scheduler_helper.h"

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

@@ -16,7 +16,7 @@
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/blink/renderer/platform/scheduler/base/real_time_domain.h"
-#include "third_party/blink/renderer/platform/scheduler/base/task_queue.h"
+#include "third_party/blink/renderer/platform/scheduler/base/task_queue_forward.h"
 #include "third_party/blink/renderer/platform/scheduler/base/task_queue_manager.h"
 #include "third_party/blink/renderer/platform/scheduler/base/test/task_queue_manager_for_test.h"
 #include "third_party/blink/renderer/platform/scheduler/common/scheduler_helper.h"

third_party/blink/renderer/platform/scheduler/common/metrics_helper.h

@@ -8,7 +8,7 @@
 #include "base/optional.h"
 #include "base/time/time.h"
 #include "third_party/blink/public/platform/web_thread_type.h"
-#include "third_party/blink/renderer/platform/scheduler/base/task_queue.h"
+#include "third_party/blink/renderer/platform/scheduler/base/task_queue_forward.h"
 #include "third_party/blink/renderer/platform/scheduler/util/task_duration_metric_reporter.h"
 
 namespace base {

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

@@ -13,7 +13,7 @@
 #include "base/threading/thread_task_runner_handle.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "third_party/blink/renderer/platform/scheduler/base/task_queue.h"
+#include "third_party/blink/renderer/platform/scheduler/base/task_queue_forward.h"
 #include "third_party/blink/renderer/platform/scheduler/base/test/task_queue_manager_for_test.h"
 #include "third_party/blink/renderer/platform/scheduler/worker/non_main_thread_scheduler_helper.h"
 

third_party/blink/renderer/platform/scheduler/common/throttling/task_queue_throttler.h

@@ -14,7 +14,7 @@
 #include "base/optional.h"
 #include "base/threading/thread_checker.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/base/task_queue_forward.h"
 #include "third_party/blink/renderer/platform/scheduler/base/time_domain.h"
 #include "third_party/blink/renderer/platform/scheduler/common/cancelable_closure_holder.h"
 #include "third_party/blink/renderer/platform/scheduler/common/throttling/budget_pool.h"

third_party/blink/renderer/platform/scheduler/main_thread/frame_scheduler_impl.h

@@ -13,7 +13,7 @@
 #include "base/single_thread_task_runner.h"
 #include "base/trace_event/trace_event.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/base/task_queue_forward.h"
 #include "third_party/blink/renderer/platform/scheduler/main_thread/frame_origin_type.h"
 #include "third_party/blink/renderer/platform/scheduler/main_thread/page_visibility_state.h"
 #include "third_party/blink/renderer/platform/scheduler/public/frame_scheduler.h"

third_party/blink/renderer/platform/scheduler/main_thread/idle_time_estimator.h

@@ -10,7 +10,7 @@
 #include "base/time/tick_clock.h"
 #include "cc/base/rolling_time_delta_history.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/base/task_queue_forward.h"
 
 namespace blink {
 namespace scheduler {

third_party/blink/renderer/platform/scheduler/main_thread/idle_time_estimator_unittest.cc

@@ -10,7 +10,7 @@
 #include "base/test/scoped_task_environment.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "third_party/blink/renderer/platform/scheduler/base/task_queue.h"
+#include "third_party/blink/renderer/platform/scheduler/base/task_queue_forward.h"
 #include "third_party/blink/renderer/platform/scheduler/base/task_queue_manager.h"
 #include "third_party/blink/renderer/platform/scheduler/base/test/task_queue_manager_for_test.h"
 #include "third_party/blink/renderer/platform/scheduler/base/test/test_task_queue.h"

third_party/blink/renderer/platform/scheduler/main_thread/main_thread_scheduler_impl.h

@@ -23,7 +23,7 @@
 #include "build/build_config.h"
 #include "third_party/blink/public/platform/scheduler/web_thread_scheduler.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/base/task_queue_forward.h"
 #include "third_party/blink/renderer/platform/scheduler/base/task_time_observer.h"
 #include "third_party/blink/renderer/platform/scheduler/child/pollable_thread_safe_flag.h"
 #include "third_party/blink/renderer/platform/scheduler/child/task_queue_with_task_type.h"

third_party/blink/renderer/platform/scheduler/main_thread/main_thread_task_queue.h

@@ -5,7 +5,7 @@
 #ifndef THIRD_PARTY_BLINK_RENDERER_PLATFORM_SCHEDULER_MAIN_THREAD_MAIN_THREAD_TASK_QUEUE_H_
 #define THIRD_PARTY_BLINK_RENDERER_PLATFORM_SCHEDULER_MAIN_THREAD_MAIN_THREAD_TASK_QUEUE_H_
 
-#include "third_party/blink/renderer/platform/scheduler/base/task_queue.h"
+#include "third_party/blink/renderer/platform/scheduler/base/task_queue_forward.h"
 #include "third_party/blink/renderer/platform/scheduler/base/task_queue_impl.h"
 #include "third_party/blink/renderer/platform/scheduler/main_thread/frame_scheduler_impl.h"
 #include "third_party/blink/renderer/platform/scheduler/public/frame_scheduler.h"

third_party/blink/renderer/platform/scheduler/main_thread/page_scheduler_impl.h

@@ -13,7 +13,7 @@
 #include "base/memory/weak_ptr.h"
 #include "base/observer_list.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/base/task_queue_forward.h"
 #include "third_party/blink/renderer/platform/scheduler/common/throttling/task_queue_throttler.h"
 #include "third_party/blink/renderer/platform/scheduler/main_thread/page_visibility_state.h"
 #include "third_party/blink/renderer/platform/scheduler/public/page_scheduler.h"

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

@@ -8,7 +8,7 @@
 #include "base/memory/weak_ptr.h"
 #include "base/single_thread_task_runner.h"
 #include "third_party/blink/public/platform/task_type.h"
-#include "third_party/blink/renderer/platform/scheduler/base/task_queue.h"
+#include "third_party/blink/renderer/platform/scheduler/base/task_queue_forward.h"
 #include "third_party/blink/renderer/platform/scheduler/public/frame_or_worker_scheduler.h"
 #include "third_party/blink/renderer/platform/scheduler/public/frame_scheduler.h"
 

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

@@ -5,7 +5,7 @@
 #include "third_party/blink/renderer/platform/scheduler/renderer/webthread_impl_for_renderer_scheduler.h"
 
 #include "base/location.h"
-#include "third_party/blink/renderer/platform/scheduler/base/task_queue.h"
+#include "third_party/blink/renderer/platform/scheduler/base/task_queue_forward.h"
 #include "third_party/blink/renderer/platform/scheduler/main_thread/main_thread_scheduler_impl.h"
 
 namespace blink {

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

@@ -12,7 +12,7 @@
 #include "base/threading/thread.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "third_party/blink/public/platform/task_type.h"
-#include "third_party/blink/renderer/platform/scheduler/base/task_queue.h"
+#include "third_party/blink/renderer/platform/scheduler/base/task_queue_forward.h"
 #include "third_party/blink/renderer/platform/scheduler/child/task_queue_with_task_type.h"
 #include "third_party/blink/renderer/platform/scheduler/common/scheduler_helper.h"
 

third_party/blink/renderer/platform/scheduler/worker/non_main_thread_scheduler_impl.h

@@ -12,7 +12,7 @@
 #include "third_party/blink/public/platform/scheduler/web_thread_scheduler.h"
 #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/base/task_queue_forward.h"
 #include "third_party/blink/renderer/platform/scheduler/common/thread_scheduler_impl.h"
 #include "third_party/blink/renderer/platform/scheduler/public/thread_scheduler.h"
 #include "third_party/blink/renderer/platform/scheduler/util/tracing_helper.h"

third_party/blink/renderer/platform/scheduler/worker/non_main_thread_task_queue.h

@@ -5,7 +5,7 @@
 #ifndef THIRD_PARTY_BLINK_RENDERER_PLATFORM_SCHEDULER_WORKER_NON_MAIN_THREAD_TASK_QUEUE_H_
 #define THIRD_PARTY_BLINK_RENDERER_PLATFORM_SCHEDULER_WORKER_NON_MAIN_THREAD_TASK_QUEUE_H_
 
-#include "third_party/blink/renderer/platform/scheduler/base/task_queue.h"
+#include "third_party/blink/renderer/platform/scheduler/base/task_queue_forward.h"
 
 namespace blink {
 namespace scheduler {

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

@@ -14,7 +14,7 @@
 #include "base/trace_event/trace_event.h"
 #include "base/trace_event/trace_event_argument.h"
 #include "third_party/blink/renderer/platform/histogram.h"
-#include "third_party/blink/renderer/platform/scheduler/base/task_queue.h"
+#include "third_party/blink/renderer/platform/scheduler/base/task_queue_forward.h"
 #include "third_party/blink/renderer/platform/scheduler/base/task_queue_manager.h"
 #include "third_party/blink/renderer/platform/scheduler/child/features.h"
 #include "third_party/blink/renderer/platform/scheduler/child/task_queue_with_task_type.h"