Update from https://crrev.com/306655

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")
 
 declare_args() {
@@ skipping 12 matching lines @@
 # 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") {
   # TODO(brettw) most of these need to be parameterized.
   defines = [
-      "CHROMIUM_BUILD",
-      "V8_DEPRECATION_WARNINGS",  # Don't use deprecated V8 APIs anywhere.
+    "CHROMIUM_BUILD",
+    "V8_DEPRECATION_WARNINGS",  # Don't use deprecated V8 APIs anywhere.
   ]
 
   if (cld_version > 0) {
     defines += [ "CLD_VERSION=$cld_version" ]
   }
   if (enable_mdns) {
     defines += [ "ENABLE_MDNS=1" ]
   }
   if (enable_notifications) {
     defines += [ "ENABLE_NOTIFICATIONS" ]
@@ skipping 119 matching lines @@
   }
   if (enable_plugin_installation) {
     defines += [ "ENABLE_PLUGIN_INSTALLATION=1" ]
   }
   if (enable_app_list) {
     defines += [ "ENABLE_APP_LIST=1" ]
   }
   if (enable_settings_app) {
     defines += [ "ENABLE_SETTINGS_APP=1" ]
   }
-  if (enable_managed_users) {
-    defines += [ "ENABLE_MANAGED_USERS=1" ]
+  if (enable_supervised_users) {
+    defines += [ "ENABLE_SUPERVISED_USERS=1" ]
   }
   if (enable_service_discovery) {
     defines += [ "ENABLE_SERVICE_DISCOVERY=1" ]
   }
   if (enable_autofill_dialog) {
     defines += [ "ENABLE_AUTOFILL_DIALOG=1" ]
   }
   if (enable_wifi_bootstrapping) {
     defines += [ "ENABLE_WIFI_BOOTSTRAPPING=1" ]
   }
@@ skipping 11 matching lines @@
   }
   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" ]
+  }
 }
 
 # Debug/release ----------------------------------------------------------------
 
 config("debug") {
   defines = [
     "_DEBUG",
     "DYNAMIC_ANNOTATIONS_ENABLED=1",
     "WTF_USE_DYNAMIC_ANNOTATIONS=1",
   ]
 
   if (is_win) {
     if (disable_iterator_debugging) {
       # Iterator debugging is enabled by the compiler on debug builds, and we
       # have to tell it to turn it off.
       defines += [ "_HAS_ITERATOR_DEBUGGING=0" ]
     }
   } else if (is_linux && !is_android && cpu_arch == "x64" &&
              !disable_iterator_debugging) {
     # Enable libstdc++ debugging facilities to help catch problems early, see
     # http://crbug.com/65151 .
     # TODO(phajdan.jr): Should we enable this for all of POSIX?
     defines += [ "_GLIBCXX_DEBUG=1" ]
   }
 }
 
 config("release") {
-  defines = [
-    "NDEBUG",
-  ]
+  defines = [ "NDEBUG" ]
 }
 
 # Default libraries ------------------------------------------------------------
 
 # This config defines the default libraries applied to all targets.
 config("default_libs") {
   if (is_win) {
     # TODO(brettw) this list of defaults should probably be smaller, and
     # instead the targets that use the less common ones (e.g. wininet or
     # winspool) should include those explicitly.
@@ skipping 14 matching lines @@
       "shell32.lib",
       "shlwapi.lib",
       "user32.lib",
       "usp10.lib",
       "uuid.lib",
       "version.lib",
       "wininet.lib",
       "winmm.lib",
       "winspool.lib",
       "ws2_32.lib",
+
       # Please don't add more stuff here. We should actually be making this
       # list smaller, since all common things should be covered. If you need
       # some extra libraries, please just add a libs = [ "foo.lib" ] to your
       # target that needs it.
     ]
   } else if (is_android) {
     # Android uses -nostdlib so we need to add even libc here.
     libs = [
       # TODO(brettw) write a version of this, hopefully we can express this
       # without forking out to GCC just to get the library name. The android
       # toolchain directory should probably be extracted into a .gni file that
       # this file and the android toolchain .gn file can share.
       #   # Manually link the libgcc.a that the cross compiler uses.
       #   '<!(<(android_toolchain)/*-gcc -print-libgcc-file-name)',
       "c",
       "dl",
-      "m"
+      "m",
     ]
   } else if (is_mac) {
     libs = [
       "AppKit.framework",
       "ApplicationServices.framework",
       "Carbon.framework",
       "CoreFoundation.framework",
       "Foundation.framework",
       "IOKit.framework",
       "Security.framework",
     ]
   } else if (is_ios) {
     libs = [
       "CoreFoundation.framework",
       "CoreGraphics.framework",
       "CoreText.framework",
       "Foundation.framework",
       "UIKit.framework",
     ]
   } else if (is_linux) {
-    libs = [
-      "dl",
-    ]
+    libs = [ "dl" ]
   }
 }