Chromium roll (https://codereview.chromium.org/976353002)

build/config/features.gni

 # Copyright 2014 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.
 
 # This file contains UI-related build flags. It should theoretically be in the
 # src/ui directory and only things that depend on the ui module should get the
 # definitions.
 #
 # However, today we have many "bad" dependencies on some of these flags from,
 # e.g. base, so they need to be global.
@@ skipping 12 matching lines @@
 
   # Enables Native Client support.
   # TODO(GYP): Get NaCl linking on other platforms.
   # Also, see if we can always get rid of enable_nacl_untrusted and
   # enable_pnacl and always build them if enable_nacl is true.
   # The "is_nacl" part of the condition is needed to ensure that
   # the untrusted code is built properly; arguably it should be
   # guarded by "is_nacl" directly rather than enable_nacl_untrusted, but
   # this will go away when Mac and Win are working and we can just use
   # the commented out logic.
-  # enable_nacl = !is_ios && !is_android
-  # Currently this *should* work:
-  # enable_nacl = (is_linux && build_cpu_arch == "x64") || is_nacl
-  enable_nacl = false
+  # 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_untrusted = enable_nacl
   enable_pnacl = enable_nacl_untrusted
 
   # If debug_devtools is set to true, JavaScript files for DevTools are stored
   # as is and loaded from disk. Otherwise, a concatenated file is stored in
   # resources.pak. It is still possible to load JS files from disk by passing
   # --debug-devtools cmdline switch.
   debug_devtools = false
 
   # Enables WebRTC.
   # TODO(GYP) make mac and android work.
   enable_webrtc = !is_ios && !is_mac && !is_android
 
   # Enables proprietary codecs and demuxers; e.g. H264, MOV, AAC, and MP3.
   proprietary_codecs = false
+
+  enable_configuration_policy = true
+
+  # Enables support for background apps.
+  enable_background = !is_ios && !is_android
+
+  enable_captive_portal_detection = !is_android && !is_ios
+
+  # Enables use of the session service, which is enabled by default.
+  # Android stores them separately on the Java side.
+  enable_session_service = !is_android && !is_ios
+
+  enable_plugin_installation = is_win || is_mac
+
+  enable_app_list = !is_ios && !is_android
+
+  enable_supervised_users = !is_ios
+
+  enable_autofill_dialog = !is_ios && !(is_android && is_android_webview_build)
+
+  enable_google_now = !is_ios && !is_android
+
+  enable_one_click_signin = is_win || is_mac || (is_linux && !is_chromeos)
 }
 
 # Additional dependent variables -----------------------------------------------
 
 # Set the version of CLD.
 #   0: Don't specify the version. This option is for the Finch testing.
 #   1: Use only CLD1.
 #   2: Use only CLD2.
 if (is_android) {
   cld_version = 1
@@ skipping 44 matching lines @@
 # 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_configuration_policy = true
-
-# Enables support for background apps.
-enable_background = !is_ios && !is_android
-
 enable_task_manager = !is_ios && !is_android
 
 use_cups = is_desktop_linux || is_mac
 
 enable_themes = !is_android && !is_ios
 
 # TODO(scottmg) remove this when we've fixed printing.
 win_pdf_metafile_for_printing = true
 
-enable_captive_portal_detection = !is_android && !is_ios
-
-# Enables use of the session service, which is enabled by default.
-# Android stores them separately on the Java side.
-enable_session_service = !is_android && !is_ios
-
 # Whether we are using the rlz library or not.  Platforms like Android send
 # rlz codes for searches but do not use the library.
 enable_rlz = is_chrome_branded && (is_win || is_mac || is_ios || is_chromeos)
 
-enable_plugin_installation = is_win || is_mac
-
-enable_app_list = !is_ios && !is_android
 enable_settings_app = enable_app_list && !is_chromeos
 
-enable_supervised_users = !is_ios
-
 enable_service_discovery = enable_mdns || is_mac
 
-enable_autofill_dialog = !is_ios && !(is_android && is_android_webview_build)
-
 enable_wifi_bootstrapping = is_win || is_mac
 
 # Image loader extension is enabled on ChromeOS only.
 enable_image_loader_extension = is_chromeos
 
 enable_remoting = !is_ios && !is_android
 
-enable_google_now = !is_ios && !is_android
-
-enable_one_click_signin = is_win || is_mac || (is_linux && !is_chromeos)
-
 # Chrome OS: whether to also build the upcoming version of
 # ChromeVox, which can then be enabled via a command-line switch.
 enable_chromevox_next = false
 
 # Use brlapi from brltty for braille display support.
 use_brlapi = is_chromeos
 
 enable_media_router = !is_ios && !is_android
 
 # Option controlling the use of GConf (the classic GNOME configuration
 # system).
 # TODO(GYP) also require !embedded to enable.
 use_gconf = is_linux && !is_chromeos
 
 # Hangout services is an extension that adds extra features to Hangouts.
 # For official GYP builds, this flag is set, it will likely need to be
 # parameterized in the future for a similar use.
 enable_hangout_services_extension = false