Revert of Use xvfb with Ozone CrOS.

testing/buildbot/gn_isolate_map.pyl

 ## Copyright 2015 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # gn_isolate_map.pyl - A mapping of Ninja build target names to GN labels and
 # test type classifications for the tests that are run on the bots.
 #
 # This mapping is used by MB so that we can uniformly refer to test binaries
 # by their Ninja target names in the recipes and not need to worry about how
 # they are referred to in GN or GYP specifically (the GYP target name is pretty
 # much always the same as the Ninja target name, since GYP target names are not
 # hierarchical).
 #
 # The "label" field specifies the matching GN label for the given ninja
 # target.
 #
 # The "type" field is used to determine what the command line for the test
 # needs to be; valid values are:
 #
 #  "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
-#    some platforms (eg. Linux Desktop, X11 CrOS and Ozone CrOS).
+#    an X11-based platform (use_x11=true or use_ozone=true &&
+#    --ozone_platform=x11).
 #  "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.
 #  "gpu_browser_test"
 #  : the test is a subset of the browser_tests that will be run against
 #    a real GPU.
 #  "additional_compile_target"
 #  : this isn't actually a test, but we still need a mapping from the
 #    ninja target to the GN label in order to analyze it.
 #  "junit_test"
@@ skipping 408 matching lines @@
     "label": "//gpu/gles2_conform_support:gles2_conform_test",
     "type": "console_test_launcher",
   },
   "gl_tests": {
     "label": "//gpu:gl_tests",
     "type": "raw",
     "args": [],
   },
   "gl_unittests": {
     "label": "//ui/gl:gl_unittests",
+    "type": "raw",
+    "args": [],
+  },
+  "gl_unittests_ozonex": {
+    "label": "//ui/gl:gl_unittests_ozonex",
+    "label_type": "group",
     "type": "windowed_test_launcher",
-    "args": [],
+    "executable": "gl_unittests",
+    "args": ["--ozone-platform=x11"],
   },
   "gn_all": {
     "label": "//:gn_all",
     "type": "additional_compile_target",
   },
   "gn_unittests": {
     "label": "//tools/gn:gn_unittests",
     "type": "raw",
     "args": [],
   },
@@ skipping 525 matching lines @@
   },
   "wm_unittests": {
     "label": "//ui/wm:wm_unittests",
     "type": "windowed_test_launcher",
   },
   "wtf_unittests": {
     "label": "//third_party/WebKit/Source/wtf:wtf_unittests",
     "type": "console_test_launcher",
   },
 }