Revert of New build flag system, convert Google Now flag

chrome/chrome_common.gypi

 # 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.
 
 {
   'variables': {
     # File lists shared with GN build.
     'chrome_common_sources': [
       'common/all_messages.h',
       'common/attrition_experiments.h',
@@ skipping 279 matching lines @@
     'chrome_common_mac_sources': [
       'common/media_galleries/iphoto_library.cc',
       'common/media_galleries/iphoto_library.h',
     ]
   },
   'targets': [
     {
       # GN: //chrome/common:common
       'target_name': 'common',
       'type': 'static_library',
-      'hard_dependency': 1,  # Because of transitive dep on version_header.
       'variables': {
         'chrome_common_target': 1,
         'enable_wexit_time_destructors': 1,
       },
       'include_dirs': [
           '..',
           '<(SHARED_INTERMEDIATE_DIR)',  # Needed by chrome_content_client.cc.
         ],
       'direct_dependent_settings': {
         'include_dirs': [
           '..',
         ],
       },
       'dependencies': [
         # 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',
         '<(DEPTH)/base/base.gyp:base_i18n',
         '<(DEPTH)/base/base.gyp:base_prefs',
         '<(DEPTH)/base/base.gyp:base_static',
         '<(DEPTH)/chrome/chrome_resources.gyp:chrome_resources',
         '<(DEPTH)/chrome/chrome_resources.gyp:chrome_strings',
         '<(DEPTH)/chrome/chrome_resources.gyp:theme_resources',
         '<(DEPTH)/chrome/common_constants.gyp:common_constants',
@@ skipping 230 matching lines @@
       'type': 'static_library',
       'sources': [
         'common/net/net_resource_provider.cc',
         'common/net/net_resource_provider.h',
         'common/net/x509_certificate_model.cc',
         'common/net/x509_certificate_model.h',
         'common/net/x509_certificate_model_nss.cc',
         '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',
         '<(DEPTH)/components/url_formatter/url_formatter.gyp:url_formatter',
         '<(DEPTH)/crypto/crypto.gyp:crypto',
         '<(DEPTH)/net/net.gyp:net',
         '<(DEPTH)/net/net.gyp:net_resources',
         '<(DEPTH)/third_party/icu/icu.gyp:icui18n',
         '<(DEPTH)/third_party/icu/icu.gyp:icuuc',
         '<(DEPTH)/ui/base/ui_base.gyp:ui_base',
@@ skipping 69 matching lines @@
         '../third_party/mojo/mojom_bindings_generator.gypi'
       ],
       'sources': [
         'common/resource_usage_reporter.mojom',
       ],
       'dependencies': [
         '../mojo/mojo_base.gyp:mojo_environment_chromium',
         '../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)',
-        ],
-      },
-    },
   ],
 }