Add TaskScheduler initialization arguments to ChildProcess.

content/renderer/render_process_impl.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/renderer/render_process_impl.h"
 
 #include "build/build_config.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #include <objidl.h>
 #include <mlang.h>
 #endif
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/debug/crash_logging.h"
 #include "base/feature_list.h"
+#include "base/memory/ptr_util.h"
 #include "base/sys_info.h"
 #include "base/task_scheduler/initialization_util.h"
-#include "base/task_scheduler/scheduler_worker_pool_params.h"
-#include "base/task_scheduler/task_scheduler.h"
 #include "base/task_scheduler/task_traits.h"
 #include "base/threading/platform_thread.h"
 #include "base/time/time.h"
 #include "content/child/site_isolation_stats_gatherer.h"
 #include "content/public/common/bindings_policy.h"
 #include "content/public/common/content_client.h"
 #include "content/public/common/content_features.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/renderer/content_renderer_client.h"
 #include "third_party/WebKit/public/web/WebFrame.h"
@@ skipping 86 matching lines @@
   if (traits.may_block() || traits.with_base_sync_primitives())
     return is_background ? BACKGROUND_FILE_IO : FOREGROUND_FILE_IO;
 
   return is_background ? BACKGROUND : FOREGROUND;
 }
 
 }  // namespace
 
 namespace content {
 
-RenderProcessImpl::RenderProcessImpl()
-    : enabled_bindings_(0) {
+RenderProcessImpl::RenderProcessImpl(
+    const std::vector<base::SchedulerWorkerPoolParams>& worker_pool_params,
+    base::TaskScheduler::WorkerPoolIndexForTraitsCallback
+        worker_pool_index_for_traits_callback)
+    : RenderProcess(worker_pool_params, worker_pool_index_for_traits_callback),

[gab, 2017/02/09 17:43:45]

std::move callback

[fdoray, 2017/02/10 18:47:11]

Done.

+      enabled_bindings_(0) {
 #if defined(OS_WIN)
   // Record whether the machine is domain joined in a crash key. This will be
   // used to better identify whether crashes are from enterprise users.
   // Note that this is done very early on so that crashes have the highest
   // chance of getting tagged.
   base::debug::SetCrashKeyValue("enrolled-to-domain",
                                 base::win::IsEnrolledToDomain() ? "yes" : "no");
 
   // HACK:  See http://b/issue?id=1024307 for rationale.
   if (GetModuleHandle(L"LPK.DLL") == NULL) {
@@ skipping 52 matching lines @@
 RenderProcessImpl::~RenderProcessImpl() {
 #ifndef NDEBUG
   int count = blink::WebFrame::instanceCount();
   if (count)
     DLOG(ERROR) << "WebFrame LEAKED " << count << " TIMES";
 #endif
 
   GetShutDownEvent()->Signal();
 }
 
+std::unique_ptr<RenderProcess> RenderProcessImpl::Create() {
+  std::vector<base::SchedulerWorkerPoolParams> worker_pool_params_vector;
+  base::TaskScheduler::WorkerPoolIndexForTraitsCallback
+      worker_pool_index_for_traits_callback;
+  content::GetContentClient()->renderer()->GetTaskSchedulerInitializationParams(
+      &worker_pool_params_vector, &worker_pool_index_for_traits_callback);
+
+  if (worker_pool_params_vector.empty()) {
+    worker_pool_params_vector = GetDefaultSchedulerWorkerPoolParams();
+    worker_pool_index_for_traits_callback =
+        base::Bind(&DefaultRendererWorkerPoolIndexForTraits);
+  }
+
+  DCHECK(!worker_pool_params_vector.empty());
+  DCHECK(worker_pool_index_for_traits_callback);
+
+  return base::WrapUnique(
+      new RenderProcessImpl(worker_pool_params_vector,
+                            std::move(worker_pool_index_for_traits_callback)));
+}
+
 void RenderProcessImpl::AddBindings(int bindings) {
   enabled_bindings_ |= bindings;
 }
 
 int RenderProcessImpl::GetEnabledBindings() const {
   return enabled_bindings_;
 }
 
-void RenderProcessImpl::InitializeTaskScheduler() {
-  std::vector<base::SchedulerWorkerPoolParams> params_vector;
-  base::TaskScheduler::WorkerPoolIndexForTraitsCallback
-      index_to_traits_callback;
-  content::GetContentClient()->renderer()->GetTaskSchedulerInitializationParams(
-      &params_vector, &index_to_traits_callback);
-
-  if (params_vector.empty()) {
-    params_vector = GetDefaultSchedulerWorkerPoolParams();
-    index_to_traits_callback =
-        base::Bind(&DefaultRendererWorkerPoolIndexForTraits);
-  }
-  DCHECK(index_to_traits_callback);
-
-  base::TaskScheduler::CreateAndSetDefaultTaskScheduler(
-      params_vector, index_to_traits_callback);
-}
-
 }  // namespace content