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 164 matching lines @@
       'dependencies': [
         'chrome_internal_resources_gen',
         'chrome_web_ui_mojo_bindings.gyp:web_ui_mojo_bindings',
       ],
       'actions': [
         {
           # GN version: //chrome/browser:resources
           'action_name': 'generate_browser_resources',
           'variables': {
             'grit_grd_file': 'browser/browser_resources.grd',
             'grit_additional_defines': [

[Dan Beam, 2015/12/31 03:08:38]

this blocks <@(chrome_grit_defines) (and hence: -D "enable_google_now=1") from
being passed along while generating browser_resources.grd.

noticed while scraping through out/Release/obj/chrome/chrome_resources.ninja to
determine why my BUILDFLAG(use_vulcanize) CL[1] wasn't working :(

[1] https://codereview.chromium.org/1494253003/

               '-E', 'additional_modules_list_file=<(additional_modules_list_file)',
               '-E', 'root_gen_dir=<(SHARED_INTERMEDIATE_DIR)',
             ],
           },
           'includes': [ '../build/grit_action.gypi' ],
         },
         {
           # GN version: //chrome/common:resources
           'action_name': 'generate_common_resources',
           'variables': {
@@ skipping 482 matching lines @@
               '<(SHARED_INTERMEDIATE_DIR)/chrome/webui_test_resources.pak',
             ],
             'pak_output': '<(PRODUCT_DIR)/browser_tests.pak',
           },
           'includes': [ '../build/repack_action.gypi' ],
         },
       ],
     },
   ], # targets
 }