TaskScheduler: Make SchedulerWorkerThread own its delegate.

base/task_scheduler/scheduler_thread_pool_impl.h

 // Copyright 2016 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 BASE_TASK_SCHEDULER_SCHEDULER_THREAD_POOL_IMPL_H_
 #define BASE_TASK_SCHEDULER_SCHEDULER_THREAD_POOL_IMPL_H_
 
 #include <stddef.h>
 
 #include <memory>
@@ skipping 33 matching lines @@
   // allowed in production; it is always leaked. In tests, it can only be
   // destroyed after JoinForTesting() has returned.
   ~SchedulerThreadPoolImpl() override;
 
   // Creates a SchedulerThreadPool with up to |max_threads| threads of priority
   // |thread_priority|. |re_enqueue_sequence_callback| will be invoked after a
   // thread of this thread pool tries to run a Task. |task_tracker| is used to
   // handle shutdown behavior of Tasks. |delayed_task_manager| handles Tasks
   // posted with a delay. Returns nullptr on failure to create a thread pool
   // with at least one thread.
-  static std::unique_ptr<SchedulerThreadPoolImpl> CreateThreadPool(
+  static std::unique_ptr<SchedulerThreadPoolImpl> Create(
       ThreadPriority thread_priority,
       size_t max_threads,
       const ReEnqueueSequenceCallback& re_enqueue_sequence_callback,
       TaskTracker* task_tracker,
       DelayedTaskManager* delayed_task_manager);
 
   // Waits until all threads are idle.
   void WaitForAllWorkerThreadsIdleForTesting();
 
   // Joins all threads of this thread pool. Tasks that are already running are
   // allowed to complete their execution. This can only be called once.
   void JoinForTesting();
 
   // SchedulerThreadPool:
   scoped_refptr<TaskRunner> CreateTaskRunnerWithTraits(
       const TaskTraits& traits,
       ExecutionMode execution_mode) override;
   void ReEnqueueSequence(scoped_refptr<Sequence> sequence,
                          const SequenceSortKey& sequence_sort_key) override;
   bool PostTaskWithSequence(std::unique_ptr<Task> task,
                             scoped_refptr<Sequence> sequence) override;
   void PostTaskWithSequenceNow(std::unique_ptr<Task> task,
                                scoped_refptr<Sequence> sequence) override;
 
  private:
   class SchedulerWorkerThreadDelegateImpl;
 
   SchedulerThreadPoolImpl(
-      const ReEnqueueSequenceCallback& re_enqueue_sequence_callback,
       TaskTracker* task_tracker,
       DelayedTaskManager* delayed_task_manager);
 
-  bool Initialize(ThreadPriority thread_priority, size_t max_threads);
+  bool Initialize(
+      ThreadPriority thread_priority,
+      size_t max_threads,
+      const ReEnqueueSequenceCallback& re_enqueue_sequence_callback);
 
   // Wakes up the last thread from this thread pool to go idle, if any.
   void WakeUpOneThread();
 
   // Adds |worker_thread| to |idle_worker_threads_stack_|.
   void AddToIdleWorkerThreadsStack(SchedulerWorkerThread* worker_thread);
 
   // PriorityQueue from which all threads of this thread pool get work.
   PriorityQueue shared_priority_queue_;
 
@@ skipping 10 matching lines @@
 
   // Stack of idle worker threads.
   SchedulerWorkerThreadStack idle_worker_threads_stack_;
 
   // Signaled when all worker threads become idle.
   std::unique_ptr<ConditionVariable> idle_worker_threads_stack_cv_for_testing_;
 
   // Signaled once JoinForTesting() has returned.
   WaitableEvent join_for_testing_returned_;
 
-  // Delegate for all worker threads in this pool.
-  std::unique_ptr<SchedulerWorkerThread::Delegate> worker_thread_delegate_;
-
   TaskTracker* const task_tracker_;
   DelayedTaskManager* const delayed_task_manager_;
 
   DISALLOW_COPY_AND_ASSIGN(SchedulerThreadPoolImpl);
 };
 
 }  // namespace internal
 }  // namespace base
 
 #endif  // BASE_TASK_SCHEDULER_SCHEDULER_THREAD_POOL_IMPL_H_