Switch mash_browser_tests to Ozone X11 platform.

testing/buildbot/chromium.fyi.json

Index: testing/buildbot/chromium.fyi.json
diff --git a/testing/buildbot/chromium.fyi.json b/testing/buildbot/chromium.fyi.json
index 728044883232ad10bab82900197d6bd0898e32b8..d688014cf385a2c07dead89e7c72b8aaa5f95ee5 100644
--- a/testing/buildbot/chromium.fyi.json
+++ b/testing/buildbot/chromium.fyi.json
@@ -11355,17 +11355,13 @@
     "gtest_tests": [
       {
         "args": [
-          "--ozone-platform=headless",
-          "--override-use-gl-with-osmesa-for-tests",
-          "--run-in-mash",
-          "--service-overrides=src/chrome/app/mash/mash_service_overrides.json",
-          "--test-launcher-filter-file=src/testing/buildbot/filters/mojo.fyi.browser_tests.filter",
-          "--use-test-config"
+          "--test-launcher-filter-file=../../testing/buildbot/filters/mojo.fyi.browser_tests.filter"
         ],
+        "hard_timeout": 60,
         "swarming": {
-          "can_use_on_swarming_builders": false
+          "can_use_on_swarming_builders": true
         },
-        "test": "browser_tests"
+        "test": "mash_browser_tests"
       }
     ]
   },
@@ -11375,18 +11371,6 @@
     ],
     "gtest_tests": [
       {
-        "args": [
-          "--override-use-gl-with-osmesa-for-tests",
-          "--run-in-mash",
-          "--service-overrides=src/chrome/app/mash/mash_service_overrides.json",
-          "--test-launcher-filter-file=src/testing/buildbot/filters/mojo.fyi.browser_tests.filter"
-        ],
-        "swarming": {
-          "can_use_on_swarming_builders": false
-        },
-        "test": "browser_tests"
-      },
-      {
         "swarming": {
           "can_use_on_swarming_builders": false
         },