simplify branding

cloud_print/cloud_print_resources.gyp

Index: cloud_print/cloud_print_resources.gyp
diff --git a/cloud_print/cloud_print_resources.gyp b/cloud_print/cloud_print_resources.gyp
index dfa8bc6418c0a8fe93cdd7a90e86a6972ea062a1..4057d23d6f3d9b97649e18e3797b508018493383 100644
--- a/cloud_print/cloud_print_resources.gyp
+++ b/cloud_print/cloud_print_resources.gyp
@@ -19,19 +19,9 @@
     {
       'target_name': 'cloud_print_version_resources',
       'type': 'none',
-      'conditions': [
-        ['branding == "Chrome"', {
-          'variables': {
-             'branding_path': '<(DEPTH)/chrome/app/theme/google_chrome/BRANDING',
-          },
-        }, { # else branding!="Chrome"
-          'variables': {
-             'branding_path': '<(DEPTH)/chrome/app/theme/chromium/BRANDING',
-          },
-        }],
-      ],
       'variables': {
         'output_dir': 'cloud_print',
+        'branding_path': '<(DEPTH)/chrome/app/theme/<(branding_path_component)/BRANDING',
         'template_input_path': '../chrome/app/chrome_version.rc.version',
         'extra_variable_files_arguments': [ '-f', 'BRANDING' ],
         'extra_variable_files': [ 'BRANDING' ], # NOTE: matches that above
@@ -56,22 +46,12 @@
     {
       'target_name': 'cloud_print_version_header',
       'type': 'none',
-      'conditions': [
-        ['branding == "Chrome"', {
-          'variables': {
-             'branding_path': '<(DEPTH)/chrome/app/theme/google_chrome/BRANDING',
-          },
-        }, { # else branding!="Chrome"
-          'variables': {
-             'branding_path': '<(DEPTH)/chrome/app/theme/chromium/BRANDING',
-          },
-        }],
-      ],
       'hard_dependency': 1,
       'actions': [
         {
           'action_name': 'version_header',
           'variables': {
+            'branding_path': '<(DEPTH)/chrome/app/theme/<(branding_path_component)/BRANDING',
             'output_dir': 'cloud_print',
             'lastchange_path':
               '<(DEPTH)/build/util/LASTCHANGE',