Update from https://crrev.com/328418

build/config/features.gni

Index: build/config/features.gni
diff --git a/build/config/features.gni b/build/config/features.gni
index dd7b0819b55e4f5258e5e6789549cbf91a645c0b..290c1d6d831f70ad296ea8b6c5c12fe66d13b2ee 100644
--- a/build/config/features.gni
+++ b/build/config/features.gni
@@ -11,6 +11,7 @@
 #
 # See also build/config/ui.gni
 
+import("//build/config/chrome_build.gni")
 if (is_android) {
   import("//build/config/android/config.gni")
 }
@@ -32,8 +33,8 @@ declare_args() {
   # the commented out logic.
   # Eventually we want this to be:
   #   enable_nacl = !is_ios && !is_android
-  enable_nacl =
-      (is_linux && !is_chromeos && !is_debug && current_cpu == "x64") || is_nacl
+  enable_nacl = (is_linux && !is_chromeos && !is_component_build &&
+                 current_cpu == "x64") || is_nacl
   enable_nacl_untrusted = enable_nacl
   enable_pnacl = enable_nacl_untrusted
 
@@ -84,6 +85,20 @@ declare_args() {
   # Enables browser side Content Decryption Modules. Required for embedders
   # (e.g. Android and ChromeCast) that use a browser side CDM.
   enable_browser_cdms = is_android
+
+  # Variable safe_browsing is used to control the build time configuration for
+  # safe browsing feature. Safe browsing can be compiled in 3 different levels:
+  # 0 disables it, 1 enables it fully, and 2 enables only UI and reporting
+  # features without enabling phishing and malware detection. This is useful to
+  # integrate a third party phishing/malware detection to existing safe browsing
+  # logic.
+  if (is_android) {
+    safe_browsing_mode = 2
+  } else if (is_ios) {
+    safe_browsing_mode = 0
+  } else {
+    safe_browsing_mode = 1
+  }
 }
 
 # Additional dependent variables -----------------------------------------------
@@ -133,19 +148,6 @@ use_dbus = is_linux
 
 enable_extensions = !is_android && !is_ios
 
-# Variable safe_browsing is used to control the build time configuration for
-# safe browsing feature. Safe browsing can be compiled in 3 different levels: 0
-# disables it, 1 enables it fully, and 2 enables only UI and reporting features
-# without enabling phishing and malware detection. This is useful to integrate
-# a third party phishing/malware detection to existing safe browsing logic.
-if (is_android) {
-  safe_browsing_mode = 2
-} else if (is_ios) {
-  safe_browsing_mode = 0
-} else {
-  safe_browsing_mode = 1
-}
-
 enable_task_manager = !is_ios && !is_android
 
 use_cups = is_desktop_linux || is_mac