Put mash_browser_tests back on main waterfall

Now that the service manager has moved back into the browser process
these tests have become reliable again. The last 100 FYI runs have had
other test suites fail, but not mash_browser_tests:

https://ci.chromium.org/buildbot/chromium.fyi/Mojo%20ChromiumOS/?limit=100

* Eliminate single_mash_browser_tests step (which was running 1 test) and
  fold into mash_browser_tests
* Put mash_browser_tests back with ~125 tests
* Synchronize mash.browser_tests.filter with mojo.fyi.browser_tests.filter

Bug: none
Test: bots
Change-Id: I44d5280ab69dcd1c27c11228737b357bece22154
Reviewed-on: https://chromium-review.googlesource.com/722107Reviewed-by: Scott Violet <sky@chromium.org>
Commit-Queue: James Cook <jamescook@chromium.org>
Cr-Commit-Position: refs/heads/master@{#509644}

testing/buildbot/chromium.chromiumos.json

@@ -95,12 +95,13 @@
         "args": [
           "--mash",
           "--override-use-software-gl-for-tests",
-          "--test-launcher-filter-file=../../testing/buildbot/filters/single.mash.browser_tests.filter"
+          "--test-launcher-filter-file=../../testing/buildbot/filters/mash.browser_tests.filter"
         ],
-        "name": "single-mash_browser_test",
+        "name": "mash_browser_tests",
         "swarming": {
           "can_use_on_swarming_builders": true,
-          "hard_timeout": 1800
+          "hard_timeout": 1800,
+          "shards": 5
         },
         "test": "browser_tests"
       },

testing/buildbot/chromium.fyi.json

@@ -12705,19 +12705,6 @@
         },
         "test": "browser_tests"
       },
-      {
-        "args": [
-          "--mash",
-          "--override-use-software-gl-for-tests",
-          "--test-launcher-filter-file=../../testing/buildbot/filters/mojo.fyi.single.mash.browser_tests.filter"
-        ],
-        "name": "single-mash_browser_test",
-        "swarming": {
-          "can_use_on_swarming_builders": true,
-          "hard_timeout": 1800
-        },
-        "test": "browser_tests"
-      },
       {
         "args": [
           "--mus",

testing/buildbot/filters/BUILD.gn

@@ -33,10 +33,8 @@ source_set("browser_tests_filters") {
     "//testing/buildbot/filters/mash.browser_tests.filter",
     "//testing/buildbot/filters/mojo.fyi.browser_tests.filter",
     "//testing/buildbot/filters/mojo.fyi.mus.browser_tests.filter",
-    "//testing/buildbot/filters/mojo.fyi.single.mash.browser_tests.filter",
     "//testing/buildbot/filters/mojo.fyi.network_browser_tests.filter",
     "//testing/buildbot/filters/mus.browser_tests.filter",
-    "//testing/buildbot/filters/single.mash.browser_tests.filter",
     "//testing/buildbot/filters/browser_tests_cros_asan.filter",
     "//testing/buildbot/filters/site-per-process.browser_tests.filter",
   ]

testing/buildbot/filters/mash.browser_tests.filter

-# Failing test
--BrowserTest.FullscreenBookmarkBar
-
 # Trying to whitelist
 BrowserDialogTest.Invoke
 CastSessionBrowserTest.CreateAndDestroy
@@ -11,14 +8,11 @@ ChromeRenderViewTest.ImagesAllowedByDefault
 ChromeRenderViewTest.ImagesBlockedByDefault
 ChromeRenderViewTest.JSBlockSentAfterPageLoad
 ChromeRenderViewTest.PluginsTemporarilyAllowed
-CreateNewFolder/FileManagerBrowserTest.Test/0
-CreateNewFolder/FileManagerBrowserTest.Test/1
-CreateNewFolder/FileManagerBrowserTest.Test/2
-CreateNewFolder/FileManagerBrowserTest.Test/3
 DeviceStatusCollectorNetworkInterfacesTest.NetworkInterfaces
 DeviceStatusCollectorNetworkInterfacesTest.ReportIfPublicSession
 DeviceStatusCollectorTest.ActivityCrossingMidnight
 DeviceStatusCollectorTest.ActivityTimesEnabledByDefault
+DeviceStatusCollectorTest.ActivityTimesKeptUntilSubmittedSuccessfully
 DeviceStatusCollectorTest.ActivityTimesOff
 DeviceStatusCollectorTest.AllActive
 DeviceStatusCollectorTest.AllIdle
@@ -53,7 +47,6 @@ FormAutocompleteTest.AjaxSucceeded_NoFormInteractionInvisible
 FormAutocompleteTest.AjaxSucceeded_NoLongerVisible
 FormAutocompleteTest.AjaxSucceeded_NoLongerVisible_DifferentActionsSameData
 FormAutocompleteTest.AjaxSucceeded_NoLongerVisible_NoAction
-FormAutocompleteTest.AjaxSucceeded_StillVisible
 FormAutocompleteTest.AutoCompleteOffFormSubmit
 FormAutocompleteTest.AutoCompleteOffInputSubmit
 FormAutocompleteTest.CollectFormlessElements
@@ -77,6 +70,7 @@ FormClassifierTest.SomeFormWithoutPasswordFields
 FormClassifierTest.kChangeFormWithTreePasswordFieldsHTML
 InstantProcessNavigationTest.ForkForNavigationsFromInstantProcess
 InstantProcessNavigationTest.ForkForNavigationsToSearchURLs
+LoginUtilsTest.MashLogin
 PageClickTrackerTest.PageClickTrackerClickDisabledInputDoesNotResetClickCounter
 PageClickTrackerTest.PageClickTrackerDisabledInputClickedNoEvent
 PageClickTrackerTest.PageClickTrackerInputClicked

testing/buildbot/filters/mojo.fyi.browser_tests.filter

@@ -70,6 +70,7 @@ FormClassifierTest.SomeFormWithoutPasswordFields
 FormClassifierTest.kChangeFormWithTreePasswordFieldsHTML
 InstantProcessNavigationTest.ForkForNavigationsFromInstantProcess
 InstantProcessNavigationTest.ForkForNavigationsToSearchURLs
+LoginUtilsTest.MashLogin
 PageClickTrackerTest.PageClickTrackerClickDisabledInputDoesNotResetClickCounter
 PageClickTrackerTest.PageClickTrackerDisabledInputClickedNoEvent
 PageClickTrackerTest.PageClickTrackerInputClicked

testing/buildbot/filters/mojo.fyi.single.mash.browser_tests.filter

-LoginUtilsTest.MashLogin

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

-LoginUtilsTest.MashLogin