ui/base and some other GN build

ui/gl/BUILD.gn

Index: ui/gl/BUILD.gn
diff --git a/ui/gl/BUILD.gn b/ui/gl/BUILD.gn
index a0c58b169060b944e3c96710be8ae6a0f9f628ef..f280f9ab371411085628c38a404b7e2ff050789b 100644
--- a/ui/gl/BUILD.gn
+++ b/ui/gl/BUILD.gn
@@ -40,7 +40,6 @@ component("gl") {
     "gl_context_stub_with_extensions.cc",
     "gl_context_stub_with_extensions.h",
     "gl_context_win.cc",
-    "gl_context_x11.cc",
     "gl_export.h",
     "gl_fence.cc",
     "gl_fence.h",
@@ -55,13 +54,11 @@ component("gl") {
     "gl_image_stub.cc",
     "gl_image_stub.h",
     "gl_image_win.cc",
-    "gl_image_x11.cc",
     "gl_implementation.cc",
     "gl_implementation.h",
     "gl_implementation_android.cc",
     "gl_implementation_mac.cc",
     "gl_implementation_win.cc",
-    "gl_implementation_x11.cc",
     "gl_osmesa_api_implementation.cc",
     "gl_osmesa_api_implementation.h",
     "gl_share_group.cc",
@@ -75,7 +72,6 @@ component("gl") {
     "gl_surface_stub.cc",
     "gl_surface_stub.h",
     "gl_surface_win.cc",
-    "gl_surface_x11.cc",
     "gl_surface_osmesa.cc",
     "gl_surface_osmesa.h",
     "gl_switches.cc",
@@ -149,12 +145,16 @@ component("gl") {
     sources += [
       "gl_context_glx.cc",
       "gl_context_glx.h",
+      "gl_context_x11.cc",
       "gl_glx_api_implementation.cc",
       "gl_glx_api_implementation.h",
       "gl_image_glx.cc",
       "gl_image_glx.h",
+      "gl_image_x11.cc",
+      "gl_implementation_x11.cc",
       "gl_surface_glx.cc",
       "gl_surface_glx.h",
+      "gl_surface_x11.cc",
       "gl_egl_api_implementation.cc",
       "gl_egl_api_implementation.h",
       "$gl_binding_output_dir/gl_bindings_autogen_glx.cc",