Revert of New build flag system, convert Google Now flag

chrome/chrome_resources.gyp

Index: chrome/chrome_resources.gyp
diff --git a/chrome/chrome_resources.gyp b/chrome/chrome_resources.gyp
index 85116d4d98ba04f151e6a4587cb4a0bca1346185..6edb8194c8477a9f4c228ad2f04b7f8f308ace50 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': [