Run content_unittests in single process mash instead of mash

Bug: 866942
Change-Id: I98736af3ee98fde639b0aac6cd6ffb052802f22e
Reviewed-on: https://chromium-review.googlesource.com/1180414Reviewed-by: Scott Violet <sky@chromium.org>
Commit-Queue: Xiyuan Xia <xiyuan@chromium.org>
Cr-Commit-Position: refs/heads/master@{#584755}

testing/buildbot/chromium.chromiumos.json

@@ -563,9 +563,9 @@
       },
       {
         "args": [
-          "--enable-features=Mash"
+          "--enable-features=SingleProcessMash"
         ],
-        "name": "mash_content_unittests",
+        "name": "single_process_mash_content_unittests",
         "swarming": {
           "can_use_on_swarming_builders": true
         },
@@ -1218,9 +1218,9 @@
       },
       {
         "args": [
-          "--enable-features=Mash"
+          "--enable-features=SingleProcessMash"
         ],
-        "name": "mash_content_unittests",
+        "name": "single_process_mash_content_unittests",
         "swarming": {
           "can_use_on_swarming_builders": true
         },

testing/buildbot/chromium.fyi.json

@@ -1474,9 +1474,9 @@
       },
       {
         "args": [
-          "--enable-features=Mash"
+          "--enable-features=SingleProcessMash"
         ],
-        "name": "mash_content_unittests",
+        "name": "single_process_mash_content_unittests",
         "swarming": {
           "can_use_on_swarming_builders": true
         },

testing/buildbot/chromium.memory.json

@@ -4626,9 +4626,9 @@
       },
       {
         "args": [
-          "--enable-features=Mash"
+          "--enable-features=SingleProcessMash"
         ],
-        "name": "mash_content_unittests",
+        "name": "single_process_mash_content_unittests",
         "swarming": {
           "can_use_on_swarming_builders": true
         },
@@ -5280,9 +5280,9 @@
       },
       {
         "args": [
-          "--enable-features=Mash"
+          "--enable-features=SingleProcessMash"
         ],
-        "name": "mash_content_unittests",
+        "name": "single_process_mash_content_unittests",
         "swarming": {
           "can_use_on_swarming_builders": true
         },

testing/buildbot/test_suites.pyl

@@ -1718,10 +1718,10 @@
         'shards': 10,
       },
     },
-    'mash_content_unittests': {
+    'single_process_mash_content_unittests': {
       'test': 'content_unittests',
       'args': [
-        '--enable-features=Mash',
+        '--enable-features=SingleProcessMash',
       ],
     },
   },

ui/aura/test/aura_test_suite_setup.cc

@@ -41,7 +41,7 @@ AuraTestSuiteSetup::AuraTestSuiteSetup() {
   DCHECK(!Env::HasInstance());
 #if BUILDFLAG(ENABLE_MUS)
   const Env::Mode env_mode =
-      features::IsAshInBrowserProcess() ? Env::Mode::LOCAL : Env::Mode::MUS;
+      features::IsUsingWindowService() ? Env::Mode::MUS : Env::Mode::LOCAL;
   env_ = Env::CreateInstance(env_mode);
   if (env_mode == Env::Mode::MUS)
     ConfigureMus();