Revert of 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 047684b70e4b094b2339836fc3fa8304c767037e..ba429261c97152c2f0d6fe2f814ccfd4b99af3c9 100644
--- a/testing/buildbot/chromium.fyi.json
+++ b/testing/buildbot/chromium.fyi.json
@@ -11357,13 +11357,17 @@
     "gtest_tests": [
       {
         "args": [
-          "--test-launcher-filter-file=../../testing/buildbot/filters/mojo.fyi.browser_tests.filter"
+          "--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"
         ],
-        "hard_timeout": 60,
-        "swarming": {
-          "can_use_on_swarming_builders": true
-        },
-        "test": "mash_browser_tests"
+        "swarming": {
+          "can_use_on_swarming_builders": false
+        },
+        "test": "browser_tests"
       }
     ]
   },
@@ -11374,13 +11378,15 @@
     "gtest_tests": [
       {
         "args": [
-          "--test-launcher-filter-file=../../testing/buildbot/filters/mojo.fyi.browser_tests.filter"
+          "--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"
         ],
-        "hard_timeout": 60,
-        "swarming": {
-          "can_use_on_swarming_builders": true
-        },
-        "test": "mash_browser_tests"
+        "swarming": {
+          "can_use_on_swarming_builders": false
+        },
+        "test": "browser_tests"
       },
       {
         "swarming": {