Reland: Run gl_unittests with Ozone X11.

BUILD.gn

 # Copyright (c) 2013 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.
 
 # This is the root build file for GN. GN will start processing by loading this
 # file, and recursively load all dependencies until all dependencies are either
 # resolved or known not to exist (which will cause the build to fail). So if
 # you add a new build file, there must be some path of dependencies from this
 # file to your new one or GN won't know about it.
 
 import("//build/config/compiler/compiler.gni")
 import("//build/config/features.gni")
 import("//build/config/sanitizers/sanitizers.gni")
 import("//build/config/ui.gni")
 import("//build_overrides/v8.gni")
 import("//extensions/features/features.gni")
 import("//media/media_options.gni")
 import("//remoting/remoting_enable.gni")
 import("//third_party/openh264/openh264_args.gni")
 import("//tools/ipc_fuzzer/ipc_fuzzer.gni")
+import("//ui/ozone/ozone.gni")
 import("//v8/gni/v8.gni")
 import("//v8/snapshot_toolchain.gni")
 
 if (is_android) {
   import("//build/config/android/config.gni")
 }
 
 declare_args() {
   # A list of extra dependencies to add to the root target. This allows a
   # checkout to add additional targets without explicitly changing any checked-
@@ skipping 335 matching lines @@
   }
 
   if (use_ozone) {
     deps += [
       "//ui/ozone",
       "//ui/ozone:ozone_unittests",
       "//ui/ozone/gl:ozone_gl_unittests",
     ]
   }
 
-  if (use_x11) {
+  if (use_x11 || ozone_platform_x11) {
     deps += [ "//tools/xdisplaycheck" ]
   }
 
   if (enable_configuration_policy) {
     deps += [ "//components/policy:policy_templates" ]
   }
 
   if (v8_use_external_startup_data) {
     deps += [ "//gin:gin_v8_snapshot_fingerprint" ]
   }
@@ skipping 709 matching lines @@
   assert(target_name != "")  # Mark as used.
   sources = invoker.actual_sources
   assert(
       sources == invoker.actual_sources,
       "Do not use a platform name in your output directory (found \"$root_build_dir\"). http://crbug.com/548283")
 }
 
 assert_valid_out_dir("_unused") {
   actual_sources = [ "$root_build_dir/foo" ]
 }