Adds the ability to run chromeos with mus

Adds the ability to run chromeos with mus

In this config the browser process contains chrome and ash. Mus is in
a separate process. This patch is just the plumbing for the switch and
detection, it doesn't actually work yet.

BUG=704985
TEST=none
R=rockot@chromium.org, tsepez@chromium.org

Review-Url: https://codereview.chromium.org/2775873002
Cr-Commit-Position: refs/heads/master@{#459599}
Committed: https://chromium.googlesource.com/chromium/src/+/12a19e335d08d57c1517991c904c2390841cb105

[sky, 2017-03-24 17:38:24]

https://codereview.chromium.org/2775873002/diff/1/chrome/browser/chrome_conte...
File chrome/browser/chrome_content_browser_manifest_overlay.json (right):

https://codereview.chromium.org/2775873002/diff/1/chrome/browser/chrome_conte...
chrome/browser/chrome_content_browser_manifest_overlay.json:32: "ui": [
"display_controller", "ime_registrar", "window_manager" ]
Thus is needed as in the --mus config chrome (actually ash, but chrome and ash
run in the browser process) connects as the windowmanager.

[sky, 2017-03-24 17:38:27]

The CQ bit was checked by sky@chromium.org to run a CQ dry run

[commit-bot: I haz the power, 2017-03-24 17:39:03]

Dry run: CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2017-03-24 18:53:08]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2017-03-24 18:53:09]

Dry run: Try jobs failed on following builders:
  linux_chromium_chromeos_ozone_rel_ng on master.tryserver.chromium.linux
(JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.linux/builders/linux_chromium_...)

[Tom Sepez, 2017-03-24 19:07:00]

lgtm

[Ken Rockot(use gerrit already), 2017-03-24 19:27:57]

lgtm

[sky, 2017-03-24 20:40:18]

The CQ bit was checked by sky@chromium.org

[sky, 2017-03-24 20:40:19]

The patchset sent to the CQ was uploaded after l-g-t-m from tsepez@chromium.org,
rockot@chromium.org
Link to the patchset: https://codereview.chromium.org/2775873002/#ps20001
(title: "fix test")

[commit-bot: I haz the power, 2017-03-24 20:40:59]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2017-03-24 22:00:41]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2017-03-24 22:00:43]

Failed to apply patch for chrome/browser/ui/ash/ash_util.cc:
While running git apply --index -p1;
  error: patch failed: chrome/browser/ui/ash/ash_util.cc:7
  error: chrome/browser/ui/ash/ash_util.cc: patch does not apply

Patch:       chrome/browser/ui/ash/ash_util.cc
Index: chrome/browser/ui/ash/ash_util.cc
diff --git a/chrome/browser/ui/ash/ash_util.cc
b/chrome/browser/ui/ash/ash_util.cc
index
77ef383bddac3a5919dfdb2baddb44ac1b455d19..4cd9986d097d519af820a3d7c72015079efeb6a1
100644
--- a/chrome/browser/ui/ash/ash_util.cc
+++ b/chrome/browser/ui/ash/ash_util.cc
@@ -7,9 +7,11 @@
 #include "ash/common/accelerators/accelerator_controller.h"
 #include "ash/common/mojo_interface_factory.h"
 #include "ash/shell.h"
+#include "base/command_line.h"
 #include "base/macros.h"
 #include "build/build_config.h"
 #include "chrome/browser/ui/ash/ash_init.h"
+#include "chrome/common/chrome_switches.h"
 #include "content/public/common/service_names.mojom.h"
 #include "services/service_manager/public/cpp/interface_registry.h"
 #include "services/service_manager/public/cpp/service.h"
@@ -59,7 +61,17 @@ bool ShouldOpenAshOnStartup() {
 }
 
 bool IsRunningInMash() {
-  return service_manager::ServiceManagerIsRemote();
+  return GetConfig() == Config::MASH;
+}
+
+Config GetConfig() {
+  if (!service_manager::ServiceManagerIsRemote())
+    return Config::CLASSIC;
+
+  return base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
+             switches::kMusConfig) == switches::kMash
+             ? Config::MASH
+             : Config::MUS;
 }
 
 bool IsAcceleratorDeprecated(const ui::Accelerator& accelerator) {

[sky, 2017-03-24 22:07:15]

The CQ bit was checked by sky@chromium.org

[sky, 2017-03-24 22:07:15]

The patchset sent to the CQ was uploaded after l-g-t-m from tsepez@chromium.org,
rockot@chromium.org
Link to the patchset: https://codereview.chromium.org/2775873002/#ps40001
(title: "merge")

[commit-bot: I haz the power, 2017-03-24 22:08:04]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2017-03-24 23:40:40]

CQ is committing da patch.

Bot data: {"patchset_id": 40001, "attempt_start_ts": 1490393235294640,
"parent_rev": "1ea19d13673e5fbe40925ba23a49f1bfa6877287", "commit_rev":
"12a19e335d08d57c1517991c904c2390841cb105"}

[commit-bot: I haz the power, 2017-03-24 23:41:30]

Description was changed from

==========
Adds the ability to run chromeos with mus

In this config the browser process contains chrome and ash. Mus is in
a separate process. This patch is just the plumbing for the switch and
detection, it doesn't actually work yet.

BUG=704985
TEST=none
R=rockot@chromium.org, tsepez@chromium.org
==========

to

==========
Adds the ability to run chromeos with mus

In this config the browser process contains chrome and ash. Mus is in
a separate process. This patch is just the plumbing for the switch and
detection, it doesn't actually work yet.

BUG=704985
TEST=none
R=rockot@chromium.org, tsepez@chromium.org

Review-Url: https://codereview.chromium.org/2775873002
Cr-Commit-Position: refs/heads/master@{#459599}
Committed:
https://chromium.googlesource.com/chromium/src/+/12a19e335d08d57c1517991c904c...
==========

[commit-bot: I haz the power, 2017-03-24 23:41:31]

Committed patchset #3 (id:40001) as
https://chromium.googlesource.com/chromium/src/+/12a19e335d08d57c1517991c904c...