Revert 165605 - Fix branding in chromoting string resources.

build/grit_action.gypi

 # Copyright (c) 2011 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 file is meant to be included into an action to invoke grit in a
 # consistent manner. To use this the following variables need to be
 # defined:
 #   grit_grd_file: string: grd file path
 #   grit_out_dir: string: the output directory path
 
 # It would be really nice to do this with a rule instead of actions, but it
 # would need to determine inputs and outputs via grit_info on a per-file
 # basis. GYP rules don’t currently support that. They could be extended to
 # do this, but then every generator would need to be updated to handle this.
 
 {
   'variables': {
     'grit_cmd': ['python', '<(DEPTH)/tools/grit/grit.py'],
-    'grit_resource_ids%': 'GRIT_DIR/../gritsettings/resource_ids',
   },
   'inputs': [
-    '<!@pymod_do_main(grit_info <@(grit_defines) --inputs <(grit_grd_file) '
-        '-f "<(grit_resource_ids)")',
+    '<!@pymod_do_main(grit_info <@(grit_defines) --inputs <(grit_grd_file))',
   ],
   'outputs': [
-    '<!@pymod_do_main(grit_info <@(grit_defines) --outputs \'<(grit_out_dir)\' '
-        '<(grit_grd_file) -f "<(grit_resource_ids)")',
+    '<!@pymod_do_main(grit_info <@(grit_defines) --outputs \'<(grit_out_dir)\' <(grit_grd_file))',
   ],
   'action': ['<@(grit_cmd)',
              '-i', '<(grit_grd_file)', 'build',
-             '-f', '<(grit_resource_ids)',
+             '-fGRIT_DIR/../gritsettings/resource_ids',
              '-o', '<(grit_out_dir)',
              '<@(grit_defines)' ],
   'msvs_cygwin_shell': 0,
   'message': 'Generating resources from <(grit_grd_file)',
 }