Increase shard count for single_process_mash_browser_tests

Increase shard count used for the debug and msan/asan builders to prevent
the tests from timing out.  Repurposes shards previously used for
mash_browser_tests, as crrev.com/c/1175222 reduced the number of tests running
as part of that suite to just 1.

Also sets the timeout for tests back to 1800.  It was bumped up to 3600
by crrev.com/c/1217124.

Bug: 874090
Change-Id: Ia2b0ea4d3264e240dadde04f8ff049ff9a8b5735
Reviewed-on: https://chromium-review.googlesource.com/1217124Reviewed-by: James Cook <jamescook@chromium.org>
Reviewed-by: Dirk Pranke <dpranke@chromium.org>
Commit-Queue: Ryan Cui <rcui@chromium.org>
Cr-Commit-Position: refs/heads/master@{#590437}

testing/buildbot/chromium.chromiumos.json

@@ -465,8 +465,7 @@
         "name": "mash_browser_tests",
         "swarming": {
           "can_use_on_swarming_builders": true,
-          "hard_timeout": 1800,
-          "shards": 20
+          "hard_timeout": 1800
         },
         "test": "browser_tests"
       },
@@ -479,8 +478,8 @@
         "name": "single_process_mash_browser_tests",
         "swarming": {
           "can_use_on_swarming_builders": true,
-          "hard_timeout": 3600,
-          "shards": 10
+          "hard_timeout": 1800,
+          "shards": 20
         },
         "test": "browser_tests"
       },
@@ -1169,7 +1168,7 @@
         "name": "single_process_mash_browser_tests",
         "swarming": {
           "can_use_on_swarming_builders": true,
-          "hard_timeout": 3600,
+          "hard_timeout": 1800,
           "shards": 10
         },
         "test": "browser_tests"

testing/buildbot/chromium.memory.json

@@ -4278,8 +4278,7 @@
         "name": "mash_browser_tests",
         "swarming": {
           "can_use_on_swarming_builders": true,
-          "hard_timeout": 1800,
-          "shards": 30
+          "hard_timeout": 1800
         },
         "test": "browser_tests"
       },
@@ -4292,8 +4291,8 @@
         "name": "single_process_mash_browser_tests",
         "swarming": {
           "can_use_on_swarming_builders": true,
-          "hard_timeout": 3600,
-          "shards": 10
+          "hard_timeout": 1800,
+          "shards": 30
         },
         "test": "browser_tests"
       },
@@ -4968,8 +4967,7 @@
         "name": "mash_browser_tests",
         "swarming": {
           "can_use_on_swarming_builders": true,
-          "hard_timeout": 1800,
-          "shards": 20
+          "hard_timeout": 1800
         },
         "test": "browser_tests"
       },
@@ -4982,8 +4980,8 @@
         "name": "single_process_mash_browser_tests",
         "swarming": {
           "can_use_on_swarming_builders": true,
-          "hard_timeout": 3600,
-          "shards": 10
+          "hard_timeout": 1800,
+          "shards": 20
         },
         "test": "browser_tests"
       },

testing/buildbot/test_suite_exceptions.pyl

@@ -723,11 +723,7 @@
       },
     },
   },
-  'mash_browser_tests': {
-    'remove_from': [
-      # Not needed on chromium.fyi because suite is on main waterfall.
-      'Mojo ChromiumOS',
-    ],
+  'single_process_mash_browser_tests': {
     'modifications': {
       # chromium.chromiumos
       'linux-chromeos-dbg': {

testing/buildbot/test_suites.pyl

@@ -1935,7 +1935,7 @@
         '--test-launcher-filter-file=../../testing/buildbot/filters/chromeos.single_process_mash.browser_tests.filter',
       ],
       'swarming': {
-        'hard_timeout': 3600,
+        'hard_timeout': 1800,
         'shards': 10,
       },
     },