just some of possible refactorings possible after inventing branding_path_component

chrome/installer/upgrade_test.gyp

Index: chrome/installer/upgrade_test.gyp
diff --git a/chrome/installer/upgrade_test.gyp b/chrome/installer/upgrade_test.gyp
index 061604ed6ed5759937ce508d43966b5ae9c59247..bccc94dbfcc6e2bfa3fb2e739cd318b9d9c8e696 100644
--- a/chrome/installer/upgrade_test.gyp
+++ b/chrome/installer/upgrade_test.gyp
@@ -4,6 +4,7 @@
 
 {
   'variables': {
+    'branding_dir': '../app/theme/<(branding_path_component)',
     'version_py': '<(DEPTH)/build/util/version.py',
     'version_path': '../../chrome/VERSION',
     'lastchange_path': '<(DEPTH)/build/util/LASTCHANGE',
@@ -87,14 +88,5 @@
         },
       ],
     }],
-    [ 'branding == "Chrome"', {
-      'variables': {
-         'branding_dir': '../app/theme/google_chrome',
-      },
-    }, { # else branding!="Chrome"
-      'variables': {
-         'branding_dir': '../app/theme/chromium',
-      },
-    }],
   ],
 }