Standardize grit invokes

build/common.gypi

Index: build/common.gypi
===================================================================
--- build/common.gypi	(revision 79444)
+++ build/common.gypi	(working copy)
@@ -488,13 +488,15 @@
         'use_gconf%': 1,
       }],
 
-      # Setup -D flags passed into grit.
+      # Setup -D and -E flags passed into grit.

[Mark Mentovai, 2011/03/25 20:16:53]

Set up as a verb is two words.

       ['branding=="Chrome"', {
         # TODO(mmoss) The .grd files look for _google_chrome, but for
         # consistency they should look for google_chrome_build like C++.
-        'grit_defines': ['-D', '_google_chrome'],
+        'grit_defines': ['-D', '_google_chrome',
+                         '-E', 'CHROMIUM_BUILD=google_chrome'],
       }, {
-        'grit_defines': ['-D', '_chromium'],
+        'grit_defines': ['-D', '_chromium',
+                         '-E', 'CHROMIUM_BUILD=chromium'],
       }],
       ['chromeos==1', {
         'grit_defines': ['-D', 'chromeos'],
@@ -1523,7 +1525,7 @@
               'psapi.lib',
               'dbghelp.lib',
             ],
-            'conditions': [ 
+            'conditions': [
               ['msvs_express', {
                 # Explicitly required when using the ATL with express
                 'AdditionalDependencies': [