GN: Only have one gfx_x11 target

ui/gfx/BUILD.gn

 # Copyright 2014 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.
 
 import("//build/config/ui.gni")
 
 if (is_android) {
   import("//build/config/android/config.gni")
   import("//build/config/android/rules.gni")
 }
@@ skipping 318 matching lines @@
     sources -= [
       "nine_image_painter.cc",
       "nine_image_painter.h",
       "path_aura.cc",
       "screen_aura.cc",
     ]
   }
 
   if (use_x11) {
     deps += [
-      ":gfx_x11",
+      "//ui/gfx/x",
     ]
   } else {
     sources -= [
       "path_x11.cc",
     ]
   }
 
   if (use_pango) {
     sources += [
       "pango_util.cc",
@@ skipping 61 matching lines @@
 if (is_android) {
   generate_jni("gfx_jni_headers") {
     sources = [
       "../android/java/src/org/chromium/ui/gfx/BitmapHelper.java",
       "../android/java/src/org/chromium/ui/gfx/DeviceDisplayInfo.java",
       "../android/java/src/org/chromium/ui/gfx/ViewConfigurationHelper.java",
     ]
     jni_package = "gfx"
   }
 }
-
-if (use_x11) {
-  component("gfx_x11") {
-    sources = [
-      "x/x11_atom_cache.cc",
-      "x/x11_atom_cache.h",
-      "x/x11_connection.cc",
-      "x/x11_connection.h",
-      "x/x11_error_tracker.cc",
-      "x/x11_error_tracker.h",
-      "x/x11_switches.cc",
-      "x/x11_switches.h",
-      "x/x11_types.cc",
-      "x/x11_types.h",
-    ]
-
-    defines = [ "GFX_IMPLEMENTATION" ]
-    configs += [ "//build/config/linux:x11" ]
-
-    deps = [
-      ":gfx_export",
-      "//base"
-    ]
-  }
-}