Revert "Add tests for single process mash"

This reverts commit 42ad79bb.

Reason for revert: [chromium sheriff] A culprit of test failures:
https://ci.chromium.org/p/chromium/builders/luci.chromium.ci/Linux%20Chromium%20OS%20ASan%20LSan%20Tests%20%281%29/28724

single_process_mash_browser_tests Run on OS: 'Ubuntu-14.04'
Max shard duration: 0:03:53.214620 (shard #3)
Min shard duration: 0:01:18.857780 (shard #0)
failures:
LoginPromptBrowserTest.LoginPromptForXHRWithoutCredentialsCancelled
LoginPromptBrowserTest.TestTwoAuths
LoginPromptBrowserTest.ShowCorrectUrlForCrossOriginMainFrameRedirects
LoginPromptBrowserTest.CancelRedundantAuths
LoginPromptBrowserTest.CancelLoginInterstitialOnRedirect
LoginPromptBrowserTest.ShouldReplaceExistingInterstitialWhenNavigated
LoginUtilsTest.MashLogin
LoginPromptBrowserTest.IncorrectConfirmation
LoginPromptBrowserTest.TestBasicAuth
LoginPromptBrowserTest.TestCancelAuth_Manual
LoginPromptBrowserTest.NoLoginPromptForXHRWithBadCredentials
LoginPromptBrowserTest.SupplyRedundantAuths
LoginPromptBrowserTest.SupplyRedundantAuthsMultiProfile
LoginPromptBrowserTest.LoginPromptForXHRWithoutCredentials
LoginPromptBrowserTest.TestDigestAuth
LoginPromptBrowserTest.AllowCrossdomainPromptForSubframes
LoginPromptBrowserTest.ShouldNotProceedExistingInterstitial
LoginPromptBrowserTest.TestCancelAuth_OnBack
LoginPromptBrowserTest.TestCancelAuth_OnForward
LoginPromptBrowserTest.BlockCrossdomainPromptForSubresources
LoginPromptBrowserTest.TestCancelAuth_OnNavigation
LoginPromptBrowserTest.ShowCorrectUrlForCrossOriginMainFrameRequests

Original change's description:
> Add tests for single process mash
> 
> Moves plain Mash tests to FYI waterfall, while retaining a login test on the
> main waterfall as a sanity check.
> 
> Bug: 874090
> Change-Id: I86c60344610c2a4f99b35f9116c5366771a16c64
> Reviewed-on: https://chromium-review.googlesource.com/1175222
> Commit-Queue: Ryan Cui <rcui@chromium.org>
> Reviewed-by: Scott Violet <sky@chromium.org>
> Reviewed-by: James Cook <jamescook@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#585665}

TBR=jamescook@chromium.org,sky@chromium.org,rcui@chromium.org

Change-Id: Ib9b9258b47e766d43ac7f3dc6b3c65aacf1230f4
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 874090
Reviewed-on: https://chromium-review.googlesource.com/1188165Reviewed-by: Hayato Ito <hayato@chromium.org>
Commit-Queue: Hayato Ito <hayato@chromium.org>
Cr-Commit-Position: refs/heads/master@{#585781}

testing/buildbot/chromium.chromiumos.json

@@ -422,7 +422,7 @@
         "args": [
           "--enable-features=Mash",
           "--override-use-software-gl-for-tests",
-          "--test-launcher-filter-file=../../testing/buildbot/filters/chromeos.mash.browser_tests.filter"
+          "--test-launcher-filter-file=../../testing/buildbot/filters/mash.browser_tests.filter"
         ],
         "name": "mash_browser_tests",
         "swarming": {
@@ -432,20 +432,6 @@
         },
         "test": "browser_tests"
       },
-      {
-        "args": [
-          "--enable-features=SingleProcessMash",
-          "--override-use-software-gl-for-tests",
-          "--test-launcher-filter-file=../../testing/buildbot/filters/chromeos.single_process_mash.browser_tests.filter"
-        ],
-        "name": "single_process_mash_browser_tests",
-        "swarming": {
-          "can_use_on_swarming_builders": true,
-          "hard_timeout": 1800,
-          "shards": 10
-        },
-        "test": "browser_tests"
-      },
       {
         "args": [
           "--enable-features=VizDisplayCompositor"
@@ -1091,22 +1077,9 @@
         "args": [
           "--enable-features=Mash",
           "--override-use-software-gl-for-tests",
-          "--test-launcher-filter-file=../../testing/buildbot/filters/chromeos.mash.browser_tests.filter"
+          "--test-launcher-filter-file=../../testing/buildbot/filters/mash.browser_tests.filter"
         ],
         "name": "mash_browser_tests",
-        "swarming": {
-          "can_use_on_swarming_builders": true,
-          "hard_timeout": 1800
-        },
-        "test": "browser_tests"
-      },
-      {
-        "args": [
-          "--enable-features=SingleProcessMash",
-          "--override-use-software-gl-for-tests",
-          "--test-launcher-filter-file=../../testing/buildbot/filters/chromeos.single_process_mash.browser_tests.filter"
-        ],
-        "name": "single_process_mash_browser_tests",
         "swarming": {
           "can_use_on_swarming_builders": true,
           "hard_timeout": 1800,

testing/buildbot/chromium.fyi.json

@@ -1449,20 +1449,6 @@
         },
         "test": "aura_unittests"
       },
-      {
-        "args": [
-          "--enable-features=Mash",
-          "--override-use-software-gl-for-tests",
-          "--test-launcher-filter-file=../../testing/buildbot/filters/chromeos.mash.fyi.browser_tests.filter"
-        ],
-        "name": "mash_fyi_browser_tests",
-        "swarming": {
-          "can_use_on_swarming_builders": true,
-          "hard_timeout": 1800,
-          "shards": 10
-        },
-        "test": "browser_tests"
-      },
       {
         "args": [
           "--enable-features=VizDisplayCompositor"
@@ -1493,9 +1479,9 @@
       },
       {
         "args": [
-          "--enable-features=Mash"
+          "--enable-features=SingleProcessMash"
         ],
-        "name": "mash_fyi_content_unittests",
+        "name": "single_process_mash_content_unittests",
         "swarming": {
           "can_use_on_swarming_builders": true
         },

testing/buildbot/chromium.memory.json

@@ -4484,7 +4484,7 @@
         "args": [
           "--enable-features=Mash",
           "--override-use-software-gl-for-tests",
-          "--test-launcher-filter-file=../../testing/buildbot/filters/chromeos.mash.browser_tests.filter"
+          "--test-launcher-filter-file=../../testing/buildbot/filters/mash.browser_tests.filter"
         ],
         "name": "mash_browser_tests",
         "swarming": {
@@ -4494,20 +4494,6 @@
         },
         "test": "browser_tests"
       },
-      {
-        "args": [
-          "--enable-features=SingleProcessMash",
-          "--override-use-software-gl-for-tests",
-          "--test-launcher-filter-file=../../testing/buildbot/filters/chromeos.single_process_mash.browser_tests.filter"
-        ],
-        "name": "single_process_mash_browser_tests",
-        "swarming": {
-          "can_use_on_swarming_builders": true,
-          "hard_timeout": 1800,
-          "shards": 10
-        },
-        "test": "browser_tests"
-      },
       {
         "args": [
           "--enable-features=VizDisplayCompositor"
@@ -5152,7 +5138,7 @@
         "args": [
           "--enable-features=Mash",
           "--override-use-software-gl-for-tests",
-          "--test-launcher-filter-file=../../testing/buildbot/filters/chromeos.mash.browser_tests.filter"
+          "--test-launcher-filter-file=../../testing/buildbot/filters/mash.browser_tests.filter"
         ],
         "name": "mash_browser_tests",
         "swarming": {
@@ -5162,20 +5148,6 @@
         },
         "test": "browser_tests"
       },
-      {
-        "args": [
-          "--enable-features=SingleProcessMash",
-          "--override-use-software-gl-for-tests",
-          "--test-launcher-filter-file=../../testing/buildbot/filters/chromeos.single_process_mash.browser_tests.filter"
-        ],
-        "name": "single_process_mash_browser_tests",
-        "swarming": {
-          "can_use_on_swarming_builders": true,
-          "hard_timeout": 1800,
-          "shards": 10
-        },
-        "test": "browser_tests"
-      },
       {
         "args": [
           "--enable-features=VizDisplayCompositor"

testing/buildbot/filters/BUILD.gn

@@ -20,9 +20,7 @@ source_set("browser_tests_filters") {
   testonly = true
 
   data = [
-    "//testing/buildbot/filters/chromeos.mash.browser_tests.filter",
-    "//testing/buildbot/filters/chromeos.mash.fyi.browser_tests.filter",
-    "//testing/buildbot/filters/chromeos.single_process_mash.browser_tests.filter",
+    "//testing/buildbot/filters/mash.browser_tests.filter",
     "//testing/buildbot/filters/mojo.fyi.network_browser_tests.filter",
     "//testing/buildbot/filters/webui_polymer2_browser_tests.filter",
   ]

testing/buildbot/filters/chromeos.mash.browser_tests.filter

-# Sanity test that validates basic login functionality.  The full suite of
-# Mash browser tests runs on the mojo.fyi waterfall.
-# Context: http://crbug.com/874090
-LoginUtilsTest.MashLogin

testing/buildbot/filters/chromeos.single_process_mash.browser_tests.filter

-# Placeholder tests that validate basic login functionality.
-# TODO: replace with full suite and blacklist once it's ready.
-# Bug: http://crbug.com/874090
-LoginPromptBrowserTest.*
-LoginUtilsTest.*
-LoginUIKeyboardTestWithUsersAndOwner.*

testing/buildbot/test_suites.pyl

@@ -1730,53 +1730,13 @@
      },
    },
 
-  'mash_fyi_chromium_gtests': {
-    'mash_fyi_browser_tests': {
-      'test': 'browser_tests',
-      'args': [
-        '--enable-features=Mash',
-        '--override-use-software-gl-for-tests',
-        '--test-launcher-filter-file=../../testing/buildbot/filters/chromeos.mash.fyi.browser_tests.filter',
-      ],
-      'swarming': {
-        'hard_timeout': 1800,
-        'shards': 10,
-      },
-    },
-    'mash_fyi_content_unittests': {
-      'test': 'content_unittests',
-      'args': [
-        '--enable-features=Mash',
-      ],
-    },
-  },
-
-  # These can be folded into linux_chromeos_specific_gtests once we stop moving
-  # tests around on the main waterfall.
-  'mash_chromium_gtests' : {
+  'mash_chromium_gtests': {
     'mash_browser_tests': {
       'test': 'browser_tests',
       'args': [
         '--enable-features=Mash',
         '--override-use-software-gl-for-tests',
-        '--test-launcher-filter-file=../../testing/buildbot/filters/chromeos.mash.browser_tests.filter',
-      ],
-      'swarming': {
-        'hard_timeout': 1800,
-        'shards': 1,
-      },
-    },
-  },
-
-  # These can be folded into linux_chromeos_specific_gtests once we stop moving
-  # tests around on the main waterfall.
-  'single_process_mash_chromium_gtests': {
-    'single_process_mash_browser_tests': {
-      'test': 'browser_tests',
-      'args': [
-        '--enable-features=SingleProcessMash',
-        '--override-use-software-gl-for-tests',
-        '--test-launcher-filter-file=../../testing/buildbot/filters/chromeos.single_process_mash.browser_tests.filter',
+        '--test-launcher-filter-file=../../testing/buildbot/filters/mash.browser_tests.filter',
       ],
       'swarming': {
         'hard_timeout': 1800,
@@ -2064,7 +2024,6 @@
       ],
       'test': 'content_browsertests',
     },
-
     'not_site_per_process_content_unittests': {
       'args': [
         '--disable-site-isolation-trials'
@@ -2408,13 +2367,13 @@
     #   linux_chromium_gtests
     #   - non_android_and_cast_and_chromeos_chromium_gtests
     #   + linux_chromeos_specific_gtests
+    #   + mash_chromium_gtests
     'aura_gtests',
     'chromium_gtests',
     'chromium_gtests_for_devices_with_graphical_output',
     'chromium_gtests_for_linux_and_chromeos_only',
     'linux_chromeos_specific_gtests',
     'linux_flavor_specific_chromium_gtests',
-    'single_process_mash_chromium_gtests',
     'mash_chromium_gtests',
     'non_android_chromium_gtests',
   ],
@@ -2749,7 +2708,7 @@
 
   'mojo_chromiumos_fyi_gtests': [
     'aura_gtests',
-    'mash_fyi_chromium_gtests',
+    'mash_chromium_gtests',
     'mojo_chromiumos_specific_gtests',
     'viz_gtests',
     'viz_non_android_fyi_gtests',