Fix branding in chromoting string resources.

When chromoting resources were converted from messages.json to .grd format
incorrect branding was used. Beside that simplified how resources are 
generated:
 1. Now <if> is used to handle branded strings instead of generating grd file in build time
 2. Removed resource_ids - ids are now specified in grd files.

BUG=158995

Review URL: https://chromiumcodereview.appspot.com/11275101

git-svn-id: http://src.chromium.org/svn/trunk/src/build@165605 4ff67af0-8c30-449e-8e8b-ad334ec8d88c

grit_action.gypi

@@ -16,16 +16,19 @@
 {
   '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))',
+    '<!@pymod_do_main(grit_info <@(grit_defines) --inputs <(grit_grd_file) '
+        '-f "<(grit_resource_ids)")',
   ],
   'outputs': [
-    '<!@pymod_do_main(grit_info <@(grit_defines) --outputs \'<(grit_out_dir)\' <(grit_grd_file))',
+    '<!@pymod_do_main(grit_info <@(grit_defines) --outputs \'<(grit_out_dir)\' '
+        '<(grit_grd_file) -f "<(grit_resource_ids)")',
   ],
   'action': ['<@(grit_cmd)',
              '-i', '<(grit_grd_file)', 'build',
-             '-fGRIT_DIR/../gritsettings/resource_ids',
+             '-f', '<(grit_resource_ids)',
              '-o', '<(grit_out_dir)',
              '<@(grit_defines)' ],
   'msvs_cygwin_shell': 0,