Use TaskScheduler::InitParams to initialize TaskScheduler in child processes.

content/child/child_process.cc

 // Copyright (c) 2012 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.
 
 #include "content/child/child_process.h"
 
 #include <string.h>
 
 #include "base/bind.h"
 #include "base/lazy_instance.h"
 #include "base/message_loop/message_loop.h"
 #include "base/metrics/statistics_recorder.h"
 #include "base/process/process_handle.h"
 #include "base/single_thread_task_runner.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
+#include "base/task_scheduler/task_scheduler.h"
 #include "base/threading/thread.h"
 #include "base/threading/thread_local.h"
 #include "build/build_config.h"
 #include "content/child/child_thread_impl.h"
 
 #if defined(OS_ANDROID)
 #include "base/debug/debugger.h"
 #endif
 
 #if defined(OS_POSIX) && !defined(OS_ANDROID)
 #include <signal.h>
 static void SigUSR1Handler(int signal) { }
 #endif
 
 namespace content {
 
 namespace {
 base::LazyInstance<base::ThreadLocalPointer<ChildProcess>>::DestructorAtExit
     g_lazy_tls = LAZY_INSTANCE_INITIALIZER;
 }
 
 ChildProcess::ChildProcess(
     base::ThreadPriority io_thread_priority,
-    const std::vector<base::SchedulerWorkerPoolParams>& worker_pool_params,
-    base::TaskScheduler::WorkerPoolIndexForTraitsCallback
-        worker_pool_index_for_traits_callback)
+    const std::string& task_scheduler_name,
+    std::unique_ptr<base::TaskScheduler::InitParams> task_scheduler_init_params)
     : ref_count_(0),
       shutdown_event_(base::WaitableEvent::ResetPolicy::MANUAL,
                       base::WaitableEvent::InitialState::NOT_SIGNALED),
       io_thread_("Chrome_ChildIOThread") {
   DCHECK(!g_lazy_tls.Pointer()->Get());
   g_lazy_tls.Pointer()->Set(this);
 
   base::StatisticsRecorder::Initialize();
 
   // Initialize TaskScheduler if not already done. A TaskScheduler may already
   // exist when ChildProcess is instantiated in the browser process or in a
   // test process.
   if (!base::TaskScheduler::GetInstance()) {
-    if (worker_pool_params.empty()) {
-      DCHECK(!worker_pool_index_for_traits_callback);
-      base::TaskScheduler::CreateAndSetSimpleTaskScheduler("ContentChild");
+    if (task_scheduler_init_params) {
+      base::TaskScheduler::CreateAndSetDefaultTaskScheduler(
+          task_scheduler_name, *task_scheduler_init_params.get());
     } else {
-      DCHECK(worker_pool_index_for_traits_callback);
-      base::TaskScheduler::CreateAndSetDefaultTaskScheduler(
-          worker_pool_params, std::move(worker_pool_index_for_traits_callback));
+      base::TaskScheduler::CreateAndSetSimpleTaskScheduler(task_scheduler_name);
     }
 
     DCHECK(base::TaskScheduler::GetInstance());
     initialized_task_scheduler_ = true;
   }
 
   // We can't recover from failing to start the IO thread.
   base::Thread::Options thread_options(base::MessageLoop::TYPE_IO, 0);
   thread_options.priority = io_thread_priority;
 #if defined(OS_ANDROID)
@@ skipping 107 matching lines @@
   memset(&sa, 0, sizeof(sa));
   sa.sa_handler = SigUSR1Handler;
   sigaction(SIGUSR1, &sa, NULL);
 
   pause();
 #endif  // defined(OS_ANDROID)
 #endif  // defined(OS_POSIX)
 }
 
 }  // namespace content