Update from https://crrev.com/312398

build/config/ui.gni

Index: build/config/ui.gni
diff --git a/build/config/ui.gni b/build/config/ui.gni
index 8c8834c844d0d90865a293ed27151ca8f2f7dfbe..46154a335e0ade67ec497e74717b7770e696e776 100644
--- a/build/config/ui.gni
+++ b/build/config/ui.gni
@@ -11,19 +11,52 @@
 #
 # See also build/config/features.gni
 
+declare_args() {
+  # Indicates if Ash is enabled. Ash is the Aura Shell which provides a
+  # desktop-like environment for Aura. Requires use_aura = true
+  use_ash = is_win || is_linux
+
+  # Indicates if Ozone is enabled. Ozone is a low-level library layer for Linux
+  # that does not require X11.
+  use_ozone = false
+
+  # Support ChromeOS touchpad gestures with ozone.
+  use_evdev_gestures = false
+
+  # Indicates if Aura is enabled. Aura is a low-level windowing library, sort
+  # of a replacement for GDI or GTK.
+  use_aura = is_win || is_linux
+
+  # True means the UI is built using the "views" framework.
+  toolkit_views = is_win || is_chromeos || use_aura
+
+  # Whether we should use glib, a low level C utility library.
+  use_glib = is_linux && !use_ozone
+}
+
 # Additional dependent variables -----------------------------------------------
 #
 # These variables depend on other variables and can't be set externally.
 
+if (is_linux && use_glib) {
+  use_cairo = true
+  use_pango = true
+} else {
+  use_cairo = false
+  use_pango = false
+}
+
 # Use GPU accelerated cross process image transport by default on linux builds
 # with the Aura window manager.
-ui_compositor_image_transport = is_linux
+ui_compositor_image_transport = use_aura && is_linux
+
+use_default_render_theme = use_aura || is_linux
 
 # Indicates if the UI toolkit depends on X11.
-use_x11 = is_linux
+use_x11 = is_linux && !use_ozone
 
-use_glib = is_linux
+use_ozone_evdev = use_ozone
 
-use_athena = false
+use_clipboard_aurax11 = is_linux && use_aura && use_x11
 
 enable_hidpi = is_mac || is_chromeos || is_win