Pre-move clean-up in blink's scheduler/base.

- Private constructor for ref-counted class.
- Remove redundant includes.
- Minor style fixes and TODOs.
- Add platform_export.h where needed.

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

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

@@ -23,7 +23,6 @@ class GracefulQueueShutdownHelper
     : public RefCountedThreadSafe<GracefulQueueShutdownHelper> {
  public:
   GracefulQueueShutdownHelper();
-  ~GracefulQueueShutdownHelper();
 
   void GracefullyShutdownTaskQueue(
       std::unique_ptr<internal::TaskQueueImpl> queue);
@@ -33,6 +32,10 @@ class GracefulQueueShutdownHelper
   std::vector<std::unique_ptr<internal::TaskQueueImpl>> TakeQueues();
 
  private:
+  // This class is ref-counted so it controls its own lifetime.
+  ~GracefulQueueShutdownHelper();
+  friend class RefCountedThreadSafe<GracefulQueueShutdownHelper>;
+
   Lock lock_;
   bool sequence_manager_deleted_;
   std::vector<std::unique_ptr<internal::TaskQueueImpl>> queues_;

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

@@ -4,9 +4,7 @@
 
 #include "third_party/blink/renderer/platform/scheduler/base/real_time_domain.h"
 
-#include "base/bind.h"
-#include "third_party/blink/renderer/platform/scheduler/base/sequence_manager_impl.h"
-#include "third_party/blink/renderer/platform/scheduler/base/task_queue_impl_forward.h"
+#include "third_party/blink/renderer/platform/scheduler/base/sequence_manager_forward.h"
 
 namespace base {
 namespace sequence_manager {

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

@@ -5,8 +5,6 @@
 #ifndef THIRD_PARTY_BLINK_RENDERER_PLATFORM_SCHEDULER_BASE_REAL_TIME_DOMAIN_H_
 #define THIRD_PARTY_BLINK_RENDERER_PLATFORM_SCHEDULER_BASE_REAL_TIME_DOMAIN_H_
 
-#include <set>
-
 #include "base/macros.h"
 #include "third_party/blink/renderer/platform/platform_export.h"
 #include "third_party/blink/renderer/platform/scheduler/base/time_domain_forward.h"

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

@@ -11,14 +11,15 @@
 #include "base/bit_cast.h"
 #include "base/compiler_specific.h"
 #include "base/debug/crash_logging.h"
+#include "base/memory/ptr_util.h"
 #include "base/rand_util.h"
 #include "base/task/sequence_manager/task_time_observer.h"
 #include "base/time/default_tick_clock.h"
 #include "base/time/tick_clock.h"
 #include "base/trace_event/trace_event.h"
+#include "build/build_config.h"
 #include "third_party/blink/renderer/platform/scheduler/base/real_time_domain.h"
 #include "third_party/blink/renderer/platform/scheduler/base/task_queue_impl_forward.h"
-#include "third_party/blink/renderer/platform/scheduler/base/task_queue_selector.h"
 #include "third_party/blink/renderer/platform/scheduler/base/thread_controller_impl.h"
 #include "third_party/blink/renderer/platform/scheduler/base/work_queue.h"
 #include "third_party/blink/renderer/platform/scheduler/base/work_queue_sets.h"
@@ -115,7 +116,7 @@ SequenceManagerImpl::MainThreadOnly::~MainThreadOnly() = default;
 // static
 std::unique_ptr<SequenceManagerImpl>
 SequenceManagerImpl::CreateOnCurrentThread() {
-  return std::unique_ptr<SequenceManagerImpl>(
+  return WrapUnique(
       new SequenceManagerImpl(internal::ThreadControllerImpl::Create(
           MessageLoop::current(), DefaultTickClock::GetInstance())));
 }
@@ -404,12 +405,14 @@ void SequenceManagerImpl::NotifyWillProcessTask(ExecutingTask* executing_task,
   if (executing_task->task_queue->GetQuiescenceMonitored())
     main_thread_only().task_was_run_on_quiescence_monitored_queue = true;
 
+#if !defined(OS_NACL)
   debug::SetCrashKeyString(
       main_thread_only().file_name_crash_key,
       executing_task->pending_task.posted_from.file_name());
   debug::SetCrashKeyString(
       main_thread_only().function_name_crash_key,
       executing_task->pending_task.posted_from.function_name());
+#endif  // OS_NACL
 
   if (executing_task->task_queue->GetShouldNotifyObservers()) {
     {
@@ -687,10 +690,12 @@ void SequenceManagerImpl::EnableCrashKeys(
     const char* function_name_crash_key_name) {
   DCHECK(!main_thread_only().file_name_crash_key);
   DCHECK(!main_thread_only().function_name_crash_key);
+#if !defined(OS_NACL)
   main_thread_only().file_name_crash_key = debug::AllocateCrashKeyString(
       file_name_crash_key_name, debug::CrashKeySize::Size64);
   main_thread_only().function_name_crash_key = debug::AllocateCrashKeyString(
       function_name_crash_key_name, debug::CrashKeySize::Size64);
+#endif  // OS_NACL
 }
 
 internal::TaskQueueImpl* SequenceManagerImpl::currently_executing_task_queue()

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

@@ -18,12 +18,10 @@
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/perf/perf_test.h"
 #include "third_party/blink/renderer/platform/scheduler/base/task_queue_impl_forward.h"
-#include "third_party/blink/renderer/platform/scheduler/base/task_queue_selector.h"
 #include "third_party/blink/renderer/platform/scheduler/base/test/mock_time_domain.h"
 #include "third_party/blink/renderer/platform/scheduler/base/test/sequence_manager_for_test.h"
 #include "third_party/blink/renderer/platform/scheduler/base/test/test_task_queue.h"
 #include "third_party/blink/renderer/platform/scheduler/base/test/test_task_time_observer.h"
-#include "third_party/blink/renderer/platform/scheduler/base/work_queue_sets.h"
 
 namespace base {
 namespace sequence_manager {

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

@@ -4,8 +4,7 @@
 
 #include "third_party/blink/renderer/platform/scheduler/base/task_queue_forward.h"
 
-#include "base/bind_helpers.h"
-#include "base/optional.h"
+#include "base/bind.h"
 #include "third_party/blink/renderer/platform/scheduler/base/sequence_manager_impl.h"
 #include "third_party/blink/renderer/platform/scheduler/base/task_queue_impl_forward.h"
 

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

@@ -7,9 +7,6 @@
 
 #include <stddef.h>
 
-#include <set>
-
-#include "base/compiler_specific.h"
 #include "base/macros.h"
 #include "base/pending_task.h"
 #include "base/threading/thread_checker.h"

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

@@ -7,6 +7,7 @@
 
 namespace base {
 namespace sequence_manager {
+namespace internal {
 
 // Used to describe the logic trigerred when a task queue is selected to
 // service.
@@ -29,6 +30,7 @@ enum class TaskQueueSelectorLogic {
   kCount = 9,
 };
 
+}  // namespace internal
 }  // namespace sequence_manager
 }  // namespace base
 

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

@@ -17,6 +17,8 @@
 
 namespace base {
 
+// TODO(kraynov): https://crbug.com/828835
+// Consider going away from using MessageLoop in the renderer process.
 class MessageLoop;
 
 namespace sequence_manager {
@@ -113,7 +115,7 @@ class PLATFORM_EXPORT ThreadControllerImpl : public ThreadController,
   RepeatingClosure immediate_do_work_closure_;
   RepeatingClosure delayed_do_work_closure_;
   CancelableClosure cancelable_delayed_do_work_closure_;
-  SequencedTaskSource* sequence_ = nullptr;  // NOT OWNED
+  SequencedTaskSource* sequence_ = nullptr;  // Not owned.
   debug::TaskAnnotator task_annotator_;
 
   WeakPtrFactory<ThreadControllerImpl> weak_factory_;

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

@@ -5,10 +5,6 @@
 #ifndef THIRD_PARTY_BLINK_RENDERER_PLATFORM_SCHEDULER_BASE_WORK_QUEUE_H_
 #define THIRD_PARTY_BLINK_RENDERER_PLATFORM_SCHEDULER_BASE_WORK_QUEUE_H_
 
-#include <stddef.h>
-
-#include <set>
-
 #include "base/task/sequence_manager/enqueue_order.h"
 #include "base/task/sequence_manager/intrusive_heap.h"
 #include "base/task/sequence_manager/sequenced_task_source.h"

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

@@ -70,8 +70,8 @@ void WorkQueueSets::OnTaskPushedToEmptyQueue(WorkQueue* work_queue) {
   bool has_enqueue_order = work_queue->GetFrontTaskEnqueueOrder(&enqueue_order);
   DCHECK(has_enqueue_order);
   size_t set_index = work_queue->work_queue_set_index();
-  DCHECK_LT(set_index, work_queue_heaps_.size()) << " set_index = "
-                                                 << set_index;
+  DCHECK_LT(set_index, work_queue_heaps_.size())
+      << " set_index = " << set_index;
   // |work_queue| should not be in work_queue_heaps_[set_index].
   DCHECK(!work_queue->heap_handle().IsValid());
   work_queue_heaps_[set_index].insert({enqueue_order, work_queue});
@@ -136,8 +136,8 @@ bool WorkQueueSets::GetOldestQueueAndEnqueueOrderInSet(
 }
 
 bool WorkQueueSets::IsSetEmpty(size_t set_index) const {
-  DCHECK_LT(set_index, work_queue_heaps_.size()) << " set_index = "
-                                                 << set_index;
+  DCHECK_LT(set_index, work_queue_heaps_.size())
+      << " set_index = " << set_index;
   return work_queue_heaps_[set_index].empty();
 }
 

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

@@ -5,8 +5,6 @@
 #ifndef THIRD_PARTY_BLINK_RENDERER_PLATFORM_SCHEDULER_BASE_WORK_QUEUE_SETS_H_
 #define THIRD_PARTY_BLINK_RENDERER_PLATFORM_SCHEDULER_BASE_WORK_QUEUE_SETS_H_
 
-#include <stddef.h>
-
 #include <map>
 #include <vector>
 

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

@@ -10,7 +10,6 @@
 #include "base/message_loop/message_loop.h"
 #include "third_party/blink/public/platform/scheduler/single_thread_idle_task_runner.h"
 #include "third_party/blink/renderer/platform/platform_export.h"
-#include "third_party/blink/renderer/platform/scheduler/base/task_queue_selector.h"
 #include "third_party/blink/renderer/platform/scheduler/common/cancelable_closure_holder.h"
 #include "third_party/blink/renderer/platform/scheduler/common/scheduler_helper.h"
 

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

@@ -8,6 +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/platform_export.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"
 

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

@@ -12,6 +12,7 @@
 #include "base/message_loop/message_loop.h"
 #include "base/time/tick_clock.h"
 #include "third_party/blink/public/platform/task_type.h"
+#include "third_party/blink/renderer/platform/platform_export.h"
 #include "third_party/blink/renderer/platform/scheduler/base/sequence_manager_forward.h"
 #include "third_party/blink/renderer/platform/scheduler/base/task_queue_selector.h"
 

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

@@ -6,6 +6,7 @@
 #define THIRD_PARTY_BLINK_RENDERER_PLATFORM_SCHEDULER_COMMON_THROTTLING_THROTTLED_TIME_DOMAIN_H_
 
 #include "base/macros.h"
+#include "third_party/blink/renderer/platform/platform_export.h"
 #include "third_party/blink/renderer/platform/scheduler/base/time_domain_forward.h"
 
 namespace blink {

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

@@ -8,6 +8,7 @@
 #include "base/macros.h"
 #include "base/message_loop/message_loop.h"
 #include "base/time/time_override.h"
+#include "third_party/blink/renderer/platform/platform_export.h"
 #include "third_party/blink/renderer/platform/scheduler/base/time_domain_forward.h"
 
 namespace blink {

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

@@ -30,7 +30,6 @@
 #include "third_party/blink/renderer/platform/instrumentation/resource_coordinator/renderer_resource_coordinator.h"
 #include "third_party/blink/renderer/platform/runtime_enabled_features.h"
 #include "third_party/blink/renderer/platform/scheduler/base/task_queue_impl_forward.h"
-#include "third_party/blink/renderer/platform/scheduler/base/task_queue_selector.h"
 #include "third_party/blink/renderer/platform/scheduler/child/features.h"
 #include "third_party/blink/renderer/platform/scheduler/child/process_state.h"
 #include "third_party/blink/renderer/platform/scheduler/common/throttling/task_queue_throttler.h"

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

@@ -24,7 +24,6 @@
 #include "third_party/blink/public/common/page/launching_process_state.h"
 #include "third_party/blink/public/platform/web_mouse_wheel_event.h"
 #include "third_party/blink/public/platform/web_touch_event.h"
-#include "third_party/blink/renderer/platform/scheduler/base/real_time_domain.h"
 #include "third_party/blink/renderer/platform/scheduler/base/test/sequence_manager_for_test.h"
 #include "third_party/blink/renderer/platform/scheduler/child/features.h"
 #include "third_party/blink/renderer/platform/scheduler/common/throttling/budget_pool.h"

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

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

third_party/blink/renderer/platform/scheduler/test/lazy_thread_controller_for_test.h

@@ -10,6 +10,9 @@
 #include "base/threading/platform_thread.h"
 #include "third_party/blink/renderer/platform/scheduler/base/thread_controller_impl.h"
 
+// TODO(kraynov): Move to //base/task/sequence_manager/test to avoid
+// cross-component exposure of internal ThreadControllerImpl.
+
 namespace blink {
 namespace scheduler {
 

third_party/blink/renderer/platform/scheduler/test/renderer_scheduler_test_support.cc

@@ -9,7 +9,6 @@
 #include "base/single_thread_task_runner.h"
 #include "base/threading/sequenced_task_runner_handle.h"
 #include "base/threading/thread_task_runner_handle.h"
-#include "third_party/blink/renderer/platform/scheduler/base/sequence_manager_impl.h"
 #include "third_party/blink/renderer/platform/scheduler/base/test/sequence_manager_for_test.h"
 #include "third_party/blink/renderer/platform/scheduler/main_thread/main_thread_scheduler_impl.h"
 #include "third_party/blink/renderer/platform/scheduler/test/lazy_thread_controller_for_test.h"

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

@@ -5,6 +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/platform_export.h"
 #include "third_party/blink/renderer/platform/scheduler/base/task_queue_forward.h"
 
 namespace blink {