Update from https://crrev.com/327068

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")
 
 declare_args() {
   # When set, turns off the (normally-on) iterator debugging and related stuff
   # that is normally turned on for Debug builds. These are generally useful for
   # catching bugs but in some cases may cause conflicts or excessive slowness.
   disable_iterator_debugging = false
 
   # Set to true to not store any build metadata, e.g. ifdef out all __DATE__
   # and __TIME__. Set to 0 to reenable the use of these macros in the code
   # base. See http://crbug.com/314403.
   #
   # Continue to embed build meta data in Official builds, basically the
   # time it was built.
   # TODO(maruel): This decision should be revisited because having an
   # official deterministic build has high value too but MSVC toolset can't
   # generate anything deterministic with WPO enabled AFAIK.
   dont_embed_build_metadata = is_official_build
 
   # Set to true to enable dcheck in Release builds.
   dcheck_always_on = false
+
+  # Set to true to compile with the OpenGL ES 2.0 conformance tests.
+  internal_gles2_conform_tests = false
 }
 
 # TODO(brettw) Most of these should be removed. Instead of global feature
 # flags, we should have more modular flags that apply only to a target and its
 # dependents. For example, depending on the "x11" meta-target should define
 # USE_X11 for all dependents so that everything that could use X11 gets the
 # define, but anything that doesn't depend on X11 doesn't see it.
 #
 # For now we define these globally to match the current GYP build.
 config("feature_flags") {
@@ skipping 72 matching lines @@
     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_openssl_certs) {
+    defines += [ "USE_OPENSSL_CERTS=1" ]
+  }
+  if (use_nss_certs) {
+    defines += [ "USE_NSS_CERTS=1" ]
   }
   if (use_ozone) {
     defines += [ "USE_OZONE=1" ]
   }
   if (use_x11) {
     defines += [ "USE_X11=1" ]
   }
   if (use_allocator != "tcmalloc") {
     defines += [ "NO_TCMALLOC" ]
   }
@@ skipping 78 matching lines @@
   }
   if (v8_use_external_startup_data) {
     defines += [ "V8_USE_EXTERNAL_STARTUP_DATA" ]
   }
   if (enable_background) {
     defines += [ "ENABLE_BACKGROUND=1" ]
   }
   if (enable_pre_sync_backup) {
     defines += [ "ENABLE_PRE_SYNC_BACKUP" ]
   }
+  if (enable_video_hole) {
+    defines += [ "VIDEO_HOLE=1" ]
+  }
+  if (safe_browsing_mode == 1) {
+    defines += [ "FULL_SAFE_BROWSING" ]
+    defines += [ "SAFE_BROWSING_CSD" ]
+    defines += [ "SAFE_BROWSING_DB_LOCAL" ]
+    defines += [ "SAFE_BROWSING_SERVICE" ]
+  } else if (safe_browsing_mode == 2) {
+    defines += [ "MOBILE_SAFE_BROWSING" ]
+    defines += [ "SAFE_BROWSING_SERVICE" ]
+  }
 }
 
 # Debug/release ----------------------------------------------------------------
 
 config("debug") {
   defines = [
     "_DEBUG",
     "DYNAMIC_ANNOTATIONS_ENABLED=1",
     "WTF_USE_DYNAMIC_ANNOTATIONS=1",
   ]
@@ skipping 87 matching lines @@
       "CoreFoundation.framework",
       "CoreGraphics.framework",
       "CoreText.framework",
       "Foundation.framework",
       "UIKit.framework",
     ]
   } else if (is_linux) {
     libs = [ "dl" ]
   }
 }