Update from https://crrev.com/312398

build/config/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.
 
 import("//build/config/allocator.gni")
 import("//build/config/crypto.gni")
 import("//build/config/features.gni")
 import("//build/config/ui.gni")
 import("//build/module_args/v8.gni")
 
@@ skipping 60 matching lines @@
   if (enable_spellcheck) {
     defines += [ "ENABLE_SPELLCHECK=1" ]
   }
   if (dont_embed_build_metadata) {
     defines += [ "DONT_EMBED_BUILD_METADATA" ]
   }
   if (use_udev) {
     # TODO(brettw) should probably be "=1".
     defines += [ "USE_UDEV" ]
   }
+  if (toolkit_views) {
+    defines += [ "TOOLKIT_VIEWS=1" ]
+  }
   if (ui_compositor_image_transport) {
     # TODO(brettw) should probably be "=1".
     defines += [ "UI_COMPOSITOR_IMAGE_TRANSPORT" ]
   }
+  if (use_ash) {
+    defines += [ "USE_ASH=1" ]
+  }
+  if (use_aura) {
+    defines += [ "USE_AURA=1" ]
+  }
+  if (use_pango) {
+    defines += [ "USE_PANGO=1" ]
+  }
+  if (use_cairo) {
+    defines += [ "USE_CAIRO=1" ]
+  }
+  if (use_clipboard_aurax11) {
+    defines += [ "USE_CLIPBOARD_AURAX11=1" ]
+  }
+  if (use_default_render_theme) {
+    defines += [ "USE_DEFAULT_RENDER_THEME=1" ]
+  }
   if (use_glib) {
     defines += [ "USE_GLIB=1" ]
   }
   if (use_openssl) {
     defines += [ "USE_OPENSSL=1" ]
     if (use_openssl_certs) {
       defines += [ "USE_OPENSSL_CERTS=1" ]
     }
   } else if (use_nss_certs) {
     # USE_NSS really means "use nss for certificate validation and storage"
     # (like USE_OPENSSL_CERTS) and not "we're linking to NSS." It might be nice
     # to rename this but we're hoping to transition away from NSS.
     defines += [ "USE_NSS=1" ]
   }
+  if (use_ozone) {
+    defines += [ "USE_OZONE=1" ]
+  }
   if (use_x11) {
     defines += [ "USE_X11=1" ]
   }
   if (use_allocator != "tcmalloc") {
     defines += [ "NO_TCMALLOC" ]
   }
   if (is_asan) {
     defines += [
       "ADDRESS_SANITIZER",
       "MEMORY_TOOL_REPLACES_ALLOCATOR",
@@ skipping 56 matching lines @@
   }
   if (enable_remoting) {
     defines += [ "ENABLE_REMOTING=1" ]
   }
   if (enable_google_now) {
     defines += [ "ENABLE_GOOGLE_NOW=1" ]
   }
   if (enable_one_click_signin) {
     defines += [ "ENABLE_ONE_CLICK_SIGNIN" ]
   }
-  if (use_athena) {
-    defines += [ "USE_ATHENA=1" ]
-  }
   if (enable_hidpi) {
     defines += [ "ENABLE_HIDPI=1" ]
   }
   if (proprietary_codecs) {
     defines += [ "USE_PROPRIETARY_CODECS" ]
   }
   if (enable_hangout_services_extension) {
     defines += [ "ENABLE_HANGOUT_SERVICES_EXTENSION=1" ]
   }
   if (v8_use_external_startup_data) {
@@ skipping 95 matching lines @@
       "CoreFoundation.framework",
       "CoreGraphics.framework",
       "CoreText.framework",
       "Foundation.framework",
       "UIKit.framework",
     ]
   } else if (is_linux) {
     libs = [ "dl" ]
   }
 }