Refactor grit -D flags into a gyp variable so we don't

build/common.gypi

Index: build/common.gypi
diff --git a/build/common.gypi b/build/common.gypi
index 5d3ef05696ccdf215dbb3c8b1422fa44d9e10895..ec10e3af585a36e711988f168f5d5024014971b3 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -17,11 +17,16 @@
     # we need to have 'chromeos' already set).
     'variables': {
       'variables': {
-        # Whether we're building a ChromeOS build.
-        'chromeos%': '0',
+        'variables': {
+          # Whether we're building a ChromeOS build.
+          'chromeos%': 0,
 
-        # Disable touch support by default.
-        'touchui%': 0,
+          # Disable touch support by default.
+          'touchui%': 0,
+        },
+        # Copy conditionally-set variables out one scope.
+        'chromeos%': '<(chromeos)',
+        'touchui%': '<(touchui)',
 
         # To do a shared build on linux we need to be able to choose between
         # type static_library and shared_library. We default to doing a static
@@ -42,6 +47,14 @@
           }, {  # OS!="linux"
             'host_arch%': 'ia32',
           }],
+
+          # Set default value of toolkit_views on for Windows, Chrome OS
+          # and the touch UI.
+          ['OS=="win" or chromeos==1 or touchui==1', {
+            'toolkit_views%': 1,
+          }, {
+            'toolkit_views%': 0,
+          }],
         ],
       },
 
@@ -50,6 +63,7 @@
       'touchui%': '<(touchui)',
       'host_arch%': '<(host_arch)',
       'library%': '<(library)',
+      'toolkit_views%': '<(toolkit_views)',
 
       # Override branding to select the desired branding flavor.
       'branding%': 'Chromium',
@@ -102,15 +116,10 @@
       # it can be overriden by the GYP command line or by ~/.gyp/include.gypi.
       'component%': '<(library)',
 
-      'conditions': [
-        # Set default value of toolkit_views on for Windows, Chrome OS
-        # and the touch UI.
-        ['OS=="win" or chromeos==1 or touchui==1', {
-          'toolkit_views%': 1,
-        }, {
-          'toolkit_views%': 0,
-        }],
+      # Set to select the Title Case versions of strings in GRD files.
+      'use_titlecase_in_grd_files%': 0,
 
+      'conditions': [
         # A flag to enable or disable our compile-time dependency
         # on gnome-keyring. If that dependency is disabled, no gnome-keyring
         # support will be available. This option is useful
@@ -128,6 +137,10 @@
         }, {
           'linux_fpic%': 1,
         }],
+        ['toolkit_views==0 or OS=="mac"', {
+          # GTK+ and Mac wants Title Case strings
+          'use_titlecase_in_grd_files%': 1,
+        }],
       ],
     },
 
@@ -150,6 +163,7 @@
     'disable_sse2%': '<(disable_sse2)',
     'library%': '<(library)',
     'component%': '<(component)',
+    'use_titlecase_in_grd_files%': '<(use_titlecase_in_grd_files)',
 
     # The release channel that this build targets. This is used to restrict
     # channel-specific build options, like which installer packages to create.
@@ -269,9 +283,6 @@
     # Set to 1 to link against libgnome-keyring instead of using dlopen().
     'linux_link_gnome_keyring%': 0,
 
-    # Set to select the Title Case versions of strings in GRD files.
-    'use_titlecase_in_grd_files%': 0,
-
     # Used to disable Native Client at compile time, for platforms where it
     # isn't supported
     'disable_nacl%': 0,
@@ -311,7 +322,7 @@
     # This allows to use libcros from the current system, ie. /usr/lib/
     # The cros_api will be pulled in as a static library, and all headers
     # from the system include dirs.
-    'system_libcros%': '0',
+    'system_libcros%': 0,
 
     # Remoting compilation is enabled by default. Set to 0 to disable.
     'remoting%': 1,
@@ -327,6 +338,8 @@
       'vi', 'zh-CN', 'zh-TW',
     ],
 
+    'grit_defines': [],
+
     # Use Harfbuzz-NG instead of Harfbuzz.
     # Under development: http://crbug.com/68551
     'use_harfbuzz_ng%': 0,
@@ -347,15 +360,10 @@
           ['(branding=="Chrome" and buildtype=="Official")', {
             'linux_dump_symbols%': 1,
           }],
-          ['toolkit_views==0', {
-            # GTK wants Title Case strings
-            'use_titlecase_in_grd_files%': 1,
-          }],
         ],
       }],  # OS=="linux" or OS=="freebsd" or OS=="openbsd"
+
       ['OS=="mac"', {
-        # Mac wants Title Case strings
-        'use_titlecase_in_grd_files%': 1,
         'conditions': [
           # mac_product_name is set to the name of the .app bundle as it should
           # appear on disk.  This duplicates data from
@@ -380,6 +388,7 @@
           }],
         ],
       }],  # OS=="mac"
+
       # Whether to use multiple cores to compile with visual studio. This is
       # optional because it sometimes causes corruption on VS 2005.
       # It is on by default on VS 2008 and off on VS 2005.
@@ -406,11 +415,13 @@
           'NACL_WIN64',
         ],
       }],
+
       ['OS=="mac" or (OS=="linux" and chromeos==0 and target_arch!="arm")', {
         'use_cups%': 1,
       }, {
         'use_cups%': 0,
       }],
+
       # Set the relative path from this file to the GYP file of the JPEG
       # library used by Chromium.
       ['use_libjpeg_turbo==1', {
@@ -418,6 +429,20 @@
       }, {
         'libjpeg_gyp_path': '../third_party/libjpeg/libjpeg.gyp',
       }],  # use_libjpeg_turbo==1
+
+      # Setup -D flags passed into grit.
+      ['chromeos==1', {
+        'grit_defines': ['-D', 'chromeos'],
+      }],
+      ['toolkit_views==1', {
+        'grit_defines': ['-D', 'toolkit_views'],
+      }],
+      ['touchui==1', {
+        'grit_defines': ['-D', 'touchui'],
+      }],
+      ['use_titlecase_in_grd_files==1', {
+        'grit_defines': ['-D', 'use_titlecase'],
+      }],
     ],
   },
   'target_defaults': {