Reland: Use xvfb with Ozone CrOS.

testing/buildbot/gn_isolate_map.pyl

Index: testing/buildbot/gn_isolate_map.pyl
diff --git a/testing/buildbot/gn_isolate_map.pyl b/testing/buildbot/gn_isolate_map.pyl
index 7c4e7127a4f327d362ea774ff0a6523a97bb2ca3..b85c1e71fed22a6a4027fe959954e93ed5094c4d 100644
--- a/testing/buildbot/gn_isolate_map.pyl
+++ b/testing/buildbot/gn_isolate_map.pyl
@@ -26,8 +26,7 @@
 #  "windowed_test_launcher"
 #  : the test is a gtest-based test that uses the "brave-new-test-launcher"
 #    from //base/test:test_support and needs to run under Xvfb if run on
-#    an X11-based platform (use_x11=true or use_ozone=true &&
-#    --ozone_platform=x11).
+#    some platforms (eg. Linux Desktop, X11 CrOS and Ozone CrOS).
 #  "console_test_launcher"
 #  : the test is a gtest-based test that uses the "brave-new-test-launcher"
 #    from //base/test:test_support but does not need Xvfb.
@@ -447,12 +446,11 @@
     "type": "raw",
     "args": [],
   },
-  "gl_unittests_ozonex": {
-    "label": "//ui/gl:gl_unittests_ozonex",
+  "gl_unittests_ozone": {
+    "label": "//ui/gl:gl_unittests_ozone",
     "label_type": "group",
     "type": "windowed_test_launcher",
     "executable": "gl_unittests",
-    "args": ["--ozone-platform=x11"],
   },
   "gn_unittests": {
     "label": "//tools/gn:gn_unittests",