Update from https://crrev.com/306655

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 57 matching lines @@
 
 # Enable printing with print preview. It does not imply
 # enable_basic_printing. It's possible to build Chrome with preview only.
 enable_print_preview = !is_android
 
 # The seccomp-bpf sandbox is only supported on three architectures
 # currently.
 # Do not disable seccomp_bpf anywhere without talking to
 # security@chromium.org!
 use_seccomp_bpf = (is_linux || is_android) &&
-  (cpu_arch == "x86" || cpu_arch == "x64" || cpu_arch == "arm")
+                  (cpu_arch == "x86" || cpu_arch == "x64" || cpu_arch == "arm")
 
 # Enable notifications everywhere except iOS.
 enable_notifications = !is_ios
 
 # TODO(brettw) this should be moved to net and only dependents get this define.
 disable_ftp_support = is_ios
 
-enable_web_speech = (!is_android && !is_ios)
+enable_web_speech = !is_android && !is_ios
 
 use_dbus = is_linux
 
-enable_extensions = (!is_android && !is_ios)
+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_ios) {
+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
 
@@ skipping 14 matching lines @@
 
 # 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_managed_users = !is_ios
+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
 
 # 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