Swarm mash_unittests

BUG=606013
TEST=test only change
[email protected]

Review-Url: https://codereview.chromium.org/1919543002
Cr-Commit-Position: refs/heads/master@{#390679}
diff --git a/testing/buildbot/chromium.linux.json b/testing/buildbot/chromium.linux.json
index b429929f..b7d65bd6 100644
--- a/testing/buildbot/chromium.linux.json
+++ b/testing/buildbot/chromium.linux.json
@@ -808,6 +808,9 @@
         "test": "leveldb_service_unittests"
       },
       {
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        },
         "test": "mash_unittests"
       },
       {
diff --git a/testing/buildbot/chromium.win.json b/testing/buildbot/chromium.win.json
index dbd1d7f31..32783f41 100644
--- a/testing/buildbot/chromium.win.json
+++ b/testing/buildbot/chromium.win.json
@@ -1766,6 +1766,12 @@
         "test": "mojo_view_manager_lib_unittests"
       },
       {
+        "args": [
+          "--override-use-gl-with-osmesa-for-tests"
+        ],
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        },
         "test": "mash_unittests"
       },
       {
diff --git a/testing/buildbot/gn_isolate_map.pyl b/testing/buildbot/gn_isolate_map.pyl
index edd32d97..c6d0c9e 100644
--- a/testing/buildbot/gn_isolate_map.pyl
+++ b/testing/buildbot/gn_isolate_map.pyl
@@ -430,7 +430,7 @@
   },
   "mash_unittests": {
     "label": "//mash:mash_unittests",
-    "type": "unknown",
+    "type": "windowed_test_launcher",
   },
   "mus_gpu_unittests": {
     "label": "//components/mus/gpu:mus_gpu_unittests",