Move some global feature defines to buildflags

chrome/common/BUILD.gn

 # 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.
 
 import("//build/buildflag_header.gni")
 import("//build/util/process_version.gni")
 import("//chrome/common/features.gni")
 import("//chrome/process_version_rc_template.gni")  # For branding_file_path.
 import("//mojo/public/tools/bindings/mojom.gni")
 import("//tools/grit/grit_rule.gni")
 
 grit("resources") {
   source = "common_resources.grd"
   use_qualified_include = true
   output_dir = "$root_gen_dir/chrome"
   output_name = "common_resources"
   outputs = [
     "grit/common_resources.h",
     "common_resources.pak",
   ]
 }
 
 buildflag_header("features") {
   header = "features.h"
   flags = [
     "ANDROID_JAVA_UI=$android_java_ui",
     "ENABLE_BACKGROUND=$enable_background",
     "ENABLE_BASIC_PRINT_DIALOG=$enable_basic_print_dialog",
+    "ENABLE_CAPTIVE_PORTAL_DETECTION=$enable_captive_portal_detection",
     "ENABLE_GOOGLE_NOW=$enable_google_now",
+    "ENABLE_HANGOUT_SERVICES_EXTENSION=$enable_hangout_services_extension",
     "ENABLE_ONE_CLICK_SIGNIN=$enable_one_click_signin",
     "ENABLE_PACKAGE_MASH_SERVICES=$enable_package_mash_services",
+    "ENABLE_PLUGIN_INSTALLATION=$enable_plugin_installation",
     "ENABLE_SERVICE_DISCOVERY=$enable_service_discovery",
     "ENABLE_XPC_NOTIFICATIONS=$enable_xpc_notifications",
     "PGO_BUILD=$pgo_build",
     "USE_VULCANIZE=$use_vulcanize",
   ]
 }
 
 # Use a static library here because many test binaries depend on this but don't
 # require many files from it. This makes linking more efficient.
 static_library("common") {
@@ skipping 519 matching lines @@
     "chrome_switches.h",
     "env_vars.cc",
     "env_vars.h",
     "pref_font_script_names-inl.h",
     "pref_font_webkit_names.h",
     "pref_names.cc",
     "pref_names.h",
   ]
 
   public_deps = [
+    ":features",
     "//content/public/common:result_codes",
   ]
   deps = [
-    ":features",
     ":version_header",
     "//base",
     "//base/third_party/dynamic_annotations",
     "//components/bookmarks/common",
     "//components/nacl/common:switches",
     "//media:cdm_paths",  # Needed by chrome_paths.cc.
     "//third_party/widevine/cdm:version_h",
   ]
 
   if (is_android) {
@@ skipping 83 matching lines @@
     "shell_handler_win.mojom",
   ]
 
   public_deps = [
     "//skia/public/interfaces",
     "//url/mojo:url_mojom_gurl",
   ]
 
   use_new_wrapper_types = false
 }