Revert of New build flag system, convert Google Now flag

chrome/chrome_resources.gyp

 # Copyright (c) 2012 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.
 {
-  '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': [
     {
       # GN version: //chrome:extra_resources
       'target_name': 'chrome_extra_resources',
       'type': 'none',
       # These resources end up in resources.pak because they are resources
       # used by internal pages.  Putting them in a separate pak file makes
       # it easier for us to reference them internally.
@@ skipping 667 matching lines @@
               '<(SHARED_INTERMEDIATE_DIR)/chrome/webui_test_resources.pak',
             ],
             'pak_output': '<(PRODUCT_DIR)/browser_tests.pak',
           },
           'includes': [ '../build/repack_action.gypi' ],
         },
       ],
     },
   ], # targets
 }