Reland: Use xvfb with Ozone CrOS.

ui/gl/BUILD.gn

Index: ui/gl/BUILD.gn
diff --git a/ui/gl/BUILD.gn b/ui/gl/BUILD.gn
index 48ad007733e5490371e1ccd3fd8ed7fb3b4959af..360551d76548c2cde1a653536f54702c2bc203f3 100644
--- a/ui/gl/BUILD.gn
+++ b/ui/gl/BUILD.gn
@@ -411,24 +411,21 @@ test("gl_unittests") {
   ]
 }
 
-# Non-Ozone trybots end up trying to build this when building "all" and failing
-# when X11 isn't there.
-if (ozone_platform_x11) {
-  group("gl_unittests_ozonex") {
-    testonly = true
-    data_deps = [
-      ":gl_unittests",
-    ]
-  }
+# We can't run this test on real Chrome OS hardware for Ozone, so new target.
+group("gl_unittests_ozone") {
+  testonly = true
+  data_deps = [
+    ":gl_unittests",
+  ]
+}
 
-  # TODO(GYP_GONE): Delete this after we've converted everything to GN.
-  # The _run targets exist only for compatibility w/ GYP.
-  group("gl_unittests_ozonex_run") {
-    testonly = true
-    deps = [
-      ":gl_unittests_ozonex",
-    ]
-  }
+# TODO(GYP_GONE): Delete this after we've converted everything to GN.
+# The _run targets exist only for compatibility w/ GYP.
+group("gl_unittests_ozone_run") {
+  testonly = true
+  deps = [
+    ":gl_unittests_ozone",
+  ]
 }
 
 if (is_android) {