optimize branding - use branding_path_component variable for defining pranding specific paths

chrome/chrome_installer.gypi

Index: chrome/chrome_installer.gypi
diff --git a/chrome/chrome_installer.gypi b/chrome/chrome_installer.gypi
index b3e1a176e9504e499322db3666d0ccd1c814a5fd..46f6eefc6a49454f20d96bca7c51f0528263607f 100644
--- a/chrome/chrome_installer.gypi
+++ b/chrome/chrome_installer.gypi
@@ -6,7 +6,8 @@
   'variables': {
     'lastchange_path': '../build/util/LASTCHANGE',
     'libpeer_target_type%': 'static_library',
-    # 'branding_dir' is set in the 'conditions' section at the bottom.
+    'branding_dir': 'app/theme/<(branding_path_component)',
+    'branding_dir_100': 'app/theme/default_100_percent/<(branding_path_component)',

[Michael Moss, 2015/04/21 18:00:28]

FYI, I think since this is moved out of the conditionals at the bottom, you can
also remove the workaround re-definitions of these variables in the Mac and
Linux sections below.

   },
   'conditions': [
     ['OS=="win"', {
@@ -158,18 +159,9 @@
               'action_name': 'installer_util_strings',
               'variables': {
                 'create_string_rc_py': 'installer/util/prebuild/create_string_rc.py',
+                'brand_strings': '<(branding_path_component)_strings',
               },
-              'conditions': [
-                ['branding=="Chrome"', {
-                  'variables': {
-                    'brand_strings': 'google_chrome_strings',
-                  },
-                }, {
-                  'variables': {
-                    'brand_strings': 'chromium_strings',
-                  },
-                }],
-              ],
+
               'inputs': [
                 '<(create_string_rc_py)',
                 'app/<(brand_strings).grd',
@@ -1091,16 +1083,5 @@
         },
       ],  # targets
     }],  # OS=="mac"
-    [ 'branding == "Chrome"', {
-      'variables': {
-         'branding_dir': 'app/theme/google_chrome',
-         'branding_dir_100': 'app/theme/default_100_percent/google_chrome',
-      },
-    }, { # else branding!="Chrome"
-      'variables': {
-         'branding_dir': 'app/theme/chromium',
-         'branding_dir_100': 'app/theme/default_100_percent/chromium',
-      },
-    }],
   ],
 }