commit 3ae6c6b59c0c9a5609fb220d7c494649ad1e826a
author kylechar <kylechar@chromium.org> Wed Jan 11 18:13:30 2017
committer Commit bot <commit-bot@chromium.org> Wed Jan 11 18:13:30 2017
tree 1c6b7dbca34a30bb5927f9cf18b8a392656d5ce6
parent 273a38965bc5b14d88d54ae1b5eb455d0343f2b6

Create TaskScheduler for all Mojo apps.

Running mustash on device currently crashes on startup. This is because
ui::Service doesn't create a TaskScheduler before Ozone DRM uses it. One
option is to have ui::Service::OnStart() create a TaskScheduler. If
other Mojo applications need a task scheduler they'll have to do the
same. Instead, have MashRunner start a TaskRunner for each process.

This fixes the crash in Ozone DRM and doesn't seem to cause any other
problems.

BUG=679840

Review-Url: https://codereview.chromium.org/2621153003
Cr-Commit-Position: refs/heads/master@{#442956}

chrome/app/mash/mash_runner.cc

diff --git a/chrome/app/mash/mash_runner.cc b/chrome/app/mash/mash_runner.cc
index 3ca96fa1..5d5d93d0 100644
--- a/chrome/app/mash/mash_runner.cc
+++ b/chrome/app/mash/mash_runner.cc
@@ -19,6 +19,7 @@
 #include "base/process/launch.h"
 #include "base/process/process.h"
 #include "base/run_loop.h"
+#include "base/sys_info.h"
 #include "base/task_scheduler/task_scheduler.h"
 #include "base/threading/sequenced_worker_pool.h"
 #include "base/trace_event/trace_event.h"
@@ -41,7 +42,6 @@
 #include "services/service_manager/runner/common/client_util.h"
 #include "services/service_manager/runner/common/switches.h"
 #include "services/service_manager/runner/init.h"
-#include "services/service_manager/standalone/context.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/ui_base_paths.h"
 #include "ui/base/ui_base_switches.h"
@@ -134,6 +134,9 @@
 MashRunner::~MashRunner() {}
 
 int MashRunner::Run() {
+  base::TaskScheduler::CreateAndSetSimpleTaskScheduler(
+      base::SysInfo::NumberOfProcessors());
+
   if (IsChild())
     return RunChild();
   RunMain();
@@ -141,8 +144,6 @@
 }
 
 void MashRunner::RunMain() {
-  base::TaskScheduler::CreateAndSetSimpleTaskScheduler(
-      service_manager::kThreadPoolMaxThreads);
   base::SequencedWorkerPool::EnableWithRedirectionToTaskSchedulerForProcess();
 
   // TODO(sky): refactor BackgroundServiceManager so can supply own context, we
@@ -193,11 +194,6 @@
 }
 
 int MashRunner::RunChild() {
-  // TODO(fdoray): Add TaskScheduler initialization code in
-  // service_manager::ServiceRunner. TaskScheduler can't be initialized here
-  // because it wouldn't be visible to the service's dynamic library.
-  // https://crbug.com/664996
-
   service_manager::WaitForDebuggerIfNecessary();
 
   base::i18n::InitializeICU();