Revert of New build flag system, convert Google Now flag (patchset #14 id:260001 of https://codereview.chromium.org/1458653002/ )

Reason for revert:
This seems to have broken webkit builders: https://build.chromium.org/p/chromium.webkit/builders/WebKit%20Win%20Builder/builds/94668

Original issue's description:
> New build flag system, convert Google Now flag
>
> This generates headers with build flags rather than forcing them all to be global. It includes an accessor wrapper so that references to the flags will fail if the proper header is not included.
>
> Converts Google Now to use this and remove the global google now define and grit define.
>
> Adds support for grit define values of "true" and "false" for ease of integration with GN (they are mapped to the corresponding Python "True" and "False").
>
> Adds dependencies from the main gyp targets to the new generated feature define target. Since GYP only does hard dependencies one level, this should reduce the chance that somebody adds more of these cases and forces to add a dependency.
>
> Committed: https://crrev.com/3118dde528359280fa0cb3c6fc5b6323e834c514
> Cr-Commit-Position: refs/heads/master@{#361527}

TBR=mark@chromium.org,spang@chromium.org,brettw@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true

Review URL: https://codereview.chromium.org/1475883002

Cr-Commit-Position: refs/heads/master@{#361541}

26 files changed, 9 insertions, 119 deletions

diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
index d09b1f2..8f19496 100644
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -6,7 +6,6 @@ import("//build/config/chrome_build.gni")
 import("//build/config/crypto.gni")
 import("//build/config/features.gni")
 import("//build/config/ui.gni")
-import("//chrome/common/features.gni")
 import("//media/media_options.gni")
 import("//third_party/protobuf/proto_library.gni")
 
@@ -958,7 +957,6 @@ if (is_win) {
 # (generate_browser_resources action)
 grit("resources") {
   source = "browser_resources.grd"
-  defines = chrome_grit_defines
   output_dir = "$root_gen_dir/chrome"
   outputs = [
     "grit/browser_resources.h",
diff --git a/chrome/browser/extensions/component_loader.cc b/chrome/browser/extensions/component_loader.cc
index 56a5178..1e4a738 100644
--- a/chrome/browser/extensions/component_loader.cc
+++ b/chrome/browser/extensions/component_loader.cc
@@ -27,7 +27,6 @@
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/extension_constants.h"
-#include "chrome/common/features.h"
 #include "chrome/grit/chromium_strings.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/crx_file/id_util.h"
@@ -383,7 +382,7 @@ void ComponentLoader::AddNetworkSpeechSynthesisExtension() {
 }
 
 void ComponentLoader::AddGoogleNowExtension() {
-#if BUILDFLAG(ENABLE_GOOGLE_NOW)
+#if defined(ENABLE_GOOGLE_NOW)
   const char kEnablePrefix[] = "Enable";
   const char kFieldTrialName[] = "GoogleNow";
   std::string enable_prefix(kEnablePrefix);
@@ -419,7 +418,7 @@ void ComponentLoader::AddGoogleNowExtension() {
   } else {
     DeleteData(google_now_manifest_id, root_directory);
   }
-#endif  // BUILDFLAG(ENABLE_GOOGLE_NOW)
+#endif  // defined(ENABLE_GOOGLE_NOW)
 }
 
 #if defined(OS_CHROMEOS)
diff --git a/chrome/browser/profiles/profile.cc b/chrome/browser/profiles/profile.cc
index 8566442..04d5e9f 100644
--- a/chrome/browser/profiles/profile.cc
+++ b/chrome/browser/profiles/profile.cc
@@ -12,7 +12,6 @@
 #include "chrome/browser/first_run/first_run.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/sync/profile_sync_service_factory.h"
-#include "chrome/common/features.h"
 #include "chrome/common/pref_names.h"
 #include "components/browser_sync/browser/profile_sync_service.h"
 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_prefs.h"
@@ -99,7 +98,7 @@ void Profile::RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
   registry->RegisterDictionaryPref(prefs::kSafeBrowsingIncidentsSent);
   registry->RegisterBooleanPref(
       prefs::kSafeBrowsingExtendedReportingOptInAllowed, true);
-#if BUILDFLAG(ENABLE_GOOGLE_NOW)
+#if defined(ENABLE_GOOGLE_NOW)
   registry->RegisterBooleanPref(prefs::kGoogleGeolocationAccessEnabled, false);
 #endif
   // This pref is intentionally outside the above #if. That flag corresponds
diff --git a/chrome/browser/resources/BUILD.gn b/chrome/browser/resources/BUILD.gn
index 14de709..a5949a2 100644
--- a/chrome/browser/resources/BUILD.gn
+++ b/chrome/browser/resources/BUILD.gn
@@ -2,12 +2,10 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("//chrome/common/features.gni")
 import("//tools/grit/grit_rule.gni")
 
 grit("memory_internals_resources") {
   source = "memory_internals_resources.grd"
-  defines = chrome_grit_defines
   outputs = [
     "grit/memory_internals_resources.h",
     "memory_internals_resources.pak",
@@ -17,7 +15,6 @@ grit("memory_internals_resources") {
 
 grit("net_internals_resources") {
   source = "net_internals_resources.grd"
-  defines = chrome_grit_defines
   outputs = [
     "grit/net_internals_resources.h",
     "net_internals_resources.pak",
@@ -27,7 +24,6 @@ grit("net_internals_resources") {
 
 grit("invalidations_resources") {
   source = "invalidations_resources.grd"
-  defines = chrome_grit_defines
   outputs = [
     "grit/invalidations_resources.h",
     "invalidations_resources.pak",
@@ -37,7 +33,6 @@ grit("invalidations_resources") {
 
 grit("password_manager_internals_resources") {
   source = "password_manager_internals_resources.grd"
-  defines = chrome_grit_defines
   outputs = [
     "grit/password_manager_internals_resources.h",
     "password_manager_internals_resources.pak",
@@ -47,7 +42,6 @@ grit("password_manager_internals_resources") {
 
 grit("signin_internals_resources") {
   source = "signin_internals_resources.grd"
-  defines = chrome_grit_defines
   outputs = [
     "grit/signin_internals_resources.h",
     "signin_internals_resources.pak",
@@ -57,7 +51,6 @@ grit("signin_internals_resources") {
 
 grit("translate_internals_resources") {
   source = "translate_internals_resources.grd"
-  defines = chrome_grit_defines
   outputs = [
     "grit/translate_internals_resources.h",
     "translate_internals_resources.pak",
@@ -78,7 +71,6 @@ copy("extension_resource_demo") {
 if (!is_ios) {
   grit("component_extension_resources") {
     source = "component_extension_resources.grd"
-    defines = chrome_grit_defines
     outputs = [
       "grit/component_extension_resources.h",
       "grit/component_extension_resources_map.cc",
@@ -90,7 +82,6 @@ if (!is_ios) {
 
   grit("settings_resources") {
     source = "settings/settings_resources.grd"
-    defines = chrome_grit_defines
     outputs = [
       "grit/settings_resources.h",
       "grit/settings_resources_map.cc",
@@ -102,7 +93,6 @@ if (!is_ios) {
 
   grit("options_resources") {
     source = "options_resources.grd"
-    defines = chrome_grit_defines
     outputs = [
       "grit/options_resources.h",
       "options_resources.pak",
@@ -112,7 +102,6 @@ if (!is_ios) {
 
   grit("options_test_resources") {
     source = "options_test_resources.grd"
-    defines = chrome_grit_defines
     outputs = [
       "grit/options_test_resources.h",
       "options_test_resources.pak",
@@ -122,7 +111,6 @@ if (!is_ios) {
 
   grit("quota_internals_resources") {
     source = "quota_internals_resources.grd"
-    defines = chrome_grit_defines
     outputs = [
       "grit/quota_internals_resources.h",
       "quota_internals_resources.pak",
@@ -132,7 +120,6 @@ if (!is_ios) {
 
   grit("sync_file_system_internals_resources") {
     source = "sync_file_system_internals_resources.grd"
-    defines = chrome_grit_defines
     outputs = [
       "grit/sync_file_system_internals_resources.h",
       "sync_file_system_internals_resources.pak",
diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn
index e8124cc..be6d20f 100644
--- a/chrome/browser/ui/BUILD.gn
+++ b/chrome/browser/ui/BUILD.gn
@@ -5,7 +5,6 @@
 import("//build/config/crypto.gni")
 import("//build/config/features.gni")
 import("//build/config/ui.gni")
-import("//chrome/common/features.gni")
 
 gypi_values = exec_script("//build/gypi_to_gn.py",
                           [ rebase_path("../../chrome_browser_ui.gypi") ],
diff --git a/chrome/browser/ui/webui/options/content_settings_handler.cc b/chrome/browser/ui/webui/options/content_settings_handler.cc
index 787a884..10ce23a 100644
--- a/chrome/browser/ui/webui/options/content_settings_handler.cc
+++ b/chrome/browser/ui/webui/options/content_settings_handler.cc
@@ -29,7 +29,6 @@
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/manifest_handlers/app_launch_info.h"
-#include "chrome/common/features.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/grit/generated_resources.h"
@@ -452,7 +451,7 @@ void ContentSettingsHandler::GetLocalizedValues(
     {"cookiesShowCookies", IDS_COOKIES_SHOW_COOKIES_BUTTON},
     {"flashStorageSettings", IDS_FLASH_STORAGE_SETTINGS},
     {"flashStorageUrl", IDS_FLASH_STORAGE_URL},
-#if BUILDFLAG(ENABLE_GOOGLE_NOW)
+#if defined(ENABLE_GOOGLE_NOW)
     {"googleGeolocationAccessEnable",
      IDS_GEOLOCATION_GOOGLE_ACCESS_ENABLE_CHKBOX},
 #endif
diff --git a/chrome/browser/ui/webui/options/options_ui.cc b/chrome/browser/ui/webui/options/options_ui.cc
index 56e784c..e69c199 100644
--- a/chrome/browser/ui/webui/options/options_ui.cc
+++ b/chrome/browser/ui/webui/options/options_ui.cc
@@ -47,7 +47,6 @@
 #include "chrome/browser/ui/webui/options/startup_pages_handler.h"
 #include "chrome/browser/ui/webui/options/sync_setup_handler.h"
 #include "chrome/browser/ui/webui/theme_source.h"
-#include "chrome/common/features.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/grit/generated_resources.h"
 #include "chrome/grit/locale_settings.h"
@@ -101,7 +100,7 @@
 #include "chrome/browser/ui/webui/options/certificate_manager_handler.h"
 #endif
 
-#if BUILDFLAG(ENABLE_GOOGLE_NOW)
+#if defined(ENABLE_GOOGLE_NOW)
 #include "chrome/browser/ui/webui/options/geolocation_options_handler.h"
 #endif
 
@@ -280,7 +279,7 @@ OptionsUI::OptionsUI(content::WebUI* web_ui)
   AddOptionsPageUIHandler(localized_strings, new CreateProfileHandler());
   AddOptionsPageUIHandler(localized_strings, new EasyUnlockHandler());
   AddOptionsPageUIHandler(localized_strings, new FontSettingsHandler());
-#if BUILDFLAG(ENABLE_GOOGLE_NOW)
+#if defined(ENABLE_GOOGLE_NOW)
   AddOptionsPageUIHandler(localized_strings, new GeolocationOptionsHandler());
 #endif
   AddOptionsPageUIHandler(localized_strings, new options::HelpOverlayHandler());
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index 9495002..cfd46cc 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -104,7 +104,6 @@
     'chrome_browser_ui.gypi',
     'chrome_common.gypi',
     'chrome_installer_util.gypi',
-    'chrome_features.gypi',
   ],
   'conditions': [
     ['OS!="ios"', {
diff --git a/chrome/chrome_android.gypi b/chrome/chrome_android.gypi
index e84068c..9c8b394 100644
--- a/chrome/chrome_android.gypi
+++ b/chrome/chrome_android.gypi
@@ -14,7 +14,6 @@
         'chrome.gyp:browser',
         'chrome.gyp:browser_ui',
         'chrome.gyp:child',
-        'chrome.gyp:chrome_common_features',
         'chrome.gyp:plugin',
         'chrome.gyp:renderer',
         'chrome.gyp:utility',
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index 6653fee..cba3bcc 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -3066,7 +3066,6 @@
         # NOTE: New dependencies should generally be added in the OS!="ios"
         # dependencies block below, rather than here.
         'browser_ui',
-        'chrome_common_features',
         'chrome_resources.gyp:chrome_extra_resources',
         'chrome_resources.gyp:chrome_resources',
         'chrome_resources.gyp:chrome_strings',
diff --git a/chrome/chrome_browser_extensions.gypi b/chrome/chrome_browser_extensions.gypi
index 7b23685..8c0ca4f 100644
--- a/chrome/chrome_browser_extensions.gypi
+++ b/chrome/chrome_browser_extensions.gypi
@@ -956,7 +956,6 @@
       # browser, then we can clean up these dependencies.
       'dependencies': [
         'browser/extensions/api/api_registration.gyp:chrome_api_registration',
-        'chrome_common_features',
         'chrome_resources.gyp:chrome_extra_resources',
         'chrome_resources.gyp:chrome_resources',
         'chrome_resources.gyp:chrome_strings',
diff --git a/chrome/chrome_child.gypi b/chrome/chrome_child.gypi
index 95298fa..6464a39 100644
--- a/chrome/chrome_child.gypi
+++ b/chrome/chrome_child.gypi
@@ -9,7 +9,6 @@
       'type': 'static_library',
       'variables': { 'enable_wexit_time_destructors': 1, },
       'dependencies': [
-        'chrome_common_features',
         '../base/base.gyp:base',
         '../content/content.gyp:content_child',
       ],
diff --git a/chrome/chrome_common.gypi b/chrome/chrome_common.gypi
index 73de6df..1438853 100644
--- a/chrome/chrome_common.gypi
+++ b/chrome/chrome_common.gypi
@@ -314,7 +314,6 @@
         # TODO(gregoryd): chrome_resources and chrome_strings could be
         #  shared with the 64-bit target, but it does not work due to a gyp
         # issue.
-        'chrome_common_features',
         'installer_util',
         'safe_browsing_proto',
         '<(DEPTH)/base/base.gyp:base',
@@ -565,7 +564,6 @@
         'common/net/x509_certificate_model_openssl.cc',
       ],
       'dependencies': [
-        'chrome_common_features',
         '<(DEPTH)/base/base.gyp:base',
         '<(DEPTH)/chrome/chrome_resources.gyp:chrome_resources',
         '<(DEPTH)/chrome/chrome_resources.gyp:chrome_strings',
@@ -655,16 +653,5 @@
         '../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings',
       ],
     },
-    {
-      # GN version: //chrome/common:features
-      'target_name': 'chrome_common_features',
-      'includes': [ '../build/buildflag_header.gypi' ],
-      'variables': {
-        'buildflag_header_path': 'chrome/common/features.h',
-        'buildflag_flags': [
-          'ENABLE_GOOGLE_NOW=<(enable_google_now)',
-        ],
-      },
-    },
   ],
 }
diff --git a/chrome/chrome_debugger.gypi b/chrome/chrome_debugger.gypi
index dae7b73..31991c6 100644
--- a/chrome/chrome_debugger.gypi
+++ b/chrome/chrome_debugger.gypi
@@ -13,7 +13,6 @@
         '../base/base.gyp:base',
         '../content/content.gyp:content_browser',
         '../net/net.gyp:net',
-        'chrome_common_features',
         'browser/devtools/webrtc_device_provider_resources.gyp:webrtc_device_provider_resources',
         'browser/devtools/devtools_protocol_constants.gyp:devtools_protocol_constants',
       ],
diff --git a/chrome/chrome_exe.gypi b/chrome/chrome_exe.gypi
index 286db96..f593901 100644
--- a/chrome/chrome_exe.gypi
+++ b/chrome/chrome_exe.gypi
@@ -46,10 +46,7 @@
       # GN version: //chrome:chrome_initial
       'target_name': 'chrome_initial',
       'type': 'executable',
-      'dependencies' : [
-        '../chrome/common_constants.gyp:version_header',
-        'chrome_common_features',
-      ],
+      'dependencies' : [ '../chrome/common_constants.gyp:version_header', ],
       # Name the exe chrome.exe, not chrome_initial.exe.
       'product_name': 'chrome',
       'mac_bundle': 1,
diff --git a/chrome/chrome_features.gypi b/chrome/chrome_features.gypi
deleted file mode 100644
index a4d8756..0000000
--- a/chrome/chrome_features.gypi
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 2015 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 is the GYP equivalent of //chrome/common/features.gni.
-# Please keep in sync!
-
-{
-  'variables': {
-    'variables': {
-      # Conditional variables.
-      'conditions': [
-        ['OS=="android" or OS=="ios"', {
-          'enable_google_now%': 0,
-        }, {
-          'enable_google_now%': 1,
-        }]
-      ],
-    },
-
-    # Anything in the conditions needs to be copied to the outer scope to be
-    # accessible.
-    'enable_google_now%': '<(enable_google_now)',
-
-    # Grit defines based on the feature flags. These must be manually added to
-    # grit targets.
-    'chrome_grit_defines': [
-      '-D', 'enable_google_now=<(enable_google_now)',
-    ]
-  },
-}
diff --git a/chrome/chrome_plugin.gypi b/chrome/chrome_plugin.gypi
index 418725b..718666c 100644
--- a/chrome/chrome_plugin.gypi
+++ b/chrome/chrome_plugin.gypi
@@ -9,7 +9,6 @@
       'type': 'static_library',
       'variables': { 'enable_wexit_time_destructors': 1, },
       'dependencies': [
-        'chrome_common_features',
         '../base/base.gyp:base',
         '../content/content.gyp:content_plugin',
         '../gin/gin.gyp:gin',
diff --git a/chrome/chrome_renderer.gypi b/chrome/chrome_renderer.gypi
index b8b978b..b12ac52 100644
--- a/chrome/chrome_renderer.gypi
+++ b/chrome/chrome_renderer.gypi
@@ -237,7 +237,6 @@
       'type': 'static_library',
       'variables': { 'enable_wexit_time_destructors': 1, },
       'dependencies': [
-        'chrome_common_features',
         'common',
         'common_mojo_bindings',
         'chrome_resources.gyp:chrome_resources',
diff --git a/chrome/chrome_resources.gyp b/chrome/chrome_resources.gyp
index 85116d4..6edb819 100644
--- a/chrome/chrome_resources.gyp
+++ b/chrome/chrome_resources.gyp
@@ -2,14 +2,8 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 {
-  'includes': [
-    'chrome_features.gypi',
-  ],
   'variables': {
-    # Apply Chrome-specific grit settings to all grit actions in this file.
     'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome',
-    'grit_additional_defines': [ '<@(chrome_grit_defines)' ],
-
     'additional_modules_list_file': '<(SHARED_INTERMEDIATE_DIR)/chrome/browser/internal/additional_modules_list.txt',
   },
   'targets': [
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index 5b6e6a9..f3a92fd9 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -1617,7 +1617,6 @@
       'type': 'executable',
       'dependencies': [
         'browser',
-        'chrome_common_features',
         'chrome_resources.gyp:chrome_resources',
         'chrome_resources.gyp:chrome_strings',
         'chrome_resources.gyp:packed_extra_resources',
@@ -2112,7 +2111,6 @@
       'type': 'executable',
       'dependencies': [
         'browser',
-        'chrome_common_features',
         'chrome_resources.gyp:browser_tests_pak',
         'chrome_resources.gyp:chrome_resources',
         'chrome_resources.gyp:chrome_strings',
@@ -2657,7 +2655,6 @@
       'type': 'executable',
       'dependencies': [
         'browser',
-        'chrome_common_features',
         'chrome_resources.gyp:chrome_resources',
         'chrome_resources.gyp:chrome_strings',
         'chrome_resources.gyp:packed_extra_resources',
diff --git a/chrome/chrome_tests_unit.gypi b/chrome/chrome_tests_unit.gypi
index f43ce67..1dc2c8c 100644
--- a/chrome/chrome_tests_unit.gypi
+++ b/chrome/chrome_tests_unit.gypi
@@ -1658,7 +1658,6 @@
         # NOTE: New dependencies should generally be added in the OS!="ios"
         # dependencies block below, rather than here.
         'browser',
-        'chrome_common_features',
         'chrome_resources.gyp:chrome_resources',
         'chrome_resources.gyp:chrome_strings',
         'chrome_resources.gyp:theme_resources',
@@ -2213,7 +2212,6 @@
         '../ui/base/ui_base.gyp:ui_base_test_support',
         '../ui/gfx/gfx.gyp:gfx_test_support',
         '../ui/resources/ui_resources.gyp:ui_resources',
-        'chrome_common_features',
         'chrome_resources.gyp:chrome_resources',
         'chrome_resources.gyp:chrome_strings',
       ],
diff --git a/chrome/chrome_utility.gypi b/chrome/chrome_utility.gypi
index 638ba4e..d70f335 100644
--- a/chrome/chrome_utility.gypi
+++ b/chrome/chrome_utility.gypi
@@ -126,7 +126,6 @@
         '../third_party/libxml/libxml.gyp:libxml',
         '<(DEPTH)/chrome/chrome_resources.gyp:chrome_resources',
         '<(DEPTH)/chrome/chrome_resources.gyp:chrome_strings',
-        'chrome_common_features',
         'common',
       ],
       'include_dirs': [
diff --git a/chrome/common/BUILD.gn b/chrome/common/BUILD.gn
index 9b20bda..bc89196 100644
--- a/chrome/common/BUILD.gn
+++ b/chrome/common/BUILD.gn
@@ -2,8 +2,6 @@
 # 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("//chrome/common/features.gni")
 import("//chrome/version.gni")
 import("//mojo/public/tools/bindings/mojom.gni")
 import("//tools/grit/grit_rule.gni")
@@ -38,11 +36,6 @@ if (enable_extensions) {
   }
 }
 
-buildflag_header("features") {
-  header = "features.h"
-  flags = [ "ENABLE_GOOGLE_NOW=$enable_google_now" ]
-}
-
 # GYP version: chrome/chrome_common.gypi:common
 static_library("common") {
   sources = rebase_path(gypi_values.chrome_common_sources, ".", "//chrome")
@@ -54,7 +47,6 @@ static_library("common") {
   ]
 
   public_deps = [
-    ":features",
     "//base:base",
     "//base:base_static",
     "//base:i18n",
@@ -323,7 +315,6 @@ static_library("constants") {
     "//content/public/common:result_codes",
   ]
   deps = [
-    ":features",
     ":version_header",
     "//base",
     "//base/third_party/dynamic_annotations",
diff --git a/chrome/common/features.gni b/chrome/common/features.gni
deleted file mode 100644
index 2e92745c..0000000
--- a/chrome/common/features.gni
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2015 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 is the GN version of //chrome/chrome_features.gypi.
-# Please keep in sync!
-
-declare_args() {
-  enable_google_now = !is_ios && !is_android
-}
-
-chrome_grit_defines = [ "enable_google_now=$enable_google_now" ]
diff --git a/chrome/common/pref_names.cc b/chrome/common/pref_names.cc
index d546cb0..f3bfd8e 100644
--- a/chrome/common/pref_names.cc
+++ b/chrome/common/pref_names.cc
@@ -5,7 +5,6 @@
 #include "chrome/common/pref_names.h"
 
 #include "base/basictypes.h"
-#include "chrome/common/features.h"
 #include "chrome/common/pref_font_webkit_names.h"
 
 namespace prefs {
@@ -1558,7 +1557,7 @@ const char kGeolocationAccessToken[] = "geolocation.access_token";
 const char kGeolocationEnabled[] = "geolocation.enabled";
 #endif
 
-#if BUILDFLAG(ENABLE_GOOGLE_NOW)
+#if defined(ENABLE_GOOGLE_NOW)
 // Boolean that is true when Google services can use the user's location.
 const char kGoogleGeolocationAccessEnabled[] =
     "googlegeolocationaccess.enabled";
diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h
index 79e1d12a..f82326b 100644
--- a/chrome/common/pref_names.h
+++ b/chrome/common/pref_names.h
@@ -10,7 +10,6 @@
 #include <stddef.h>
 
 #include "build/build_config.h"
-#include "chrome/common/features.h"
 
 namespace prefs {
 
@@ -558,7 +557,7 @@ extern const char kGeolocationAccessToken[];
 extern const char kGeolocationEnabled[];
 #endif
 
-#if BUILDFLAG(ENABLE_GOOGLE_NOW)
+#if defined(ENABLE_GOOGLE_NOW)
 extern const char kGoogleGeolocationAccessEnabled[];
 #endif
 extern const char kGoogleNowLauncherEnabled[];