use 'branding_path_component' to simplify branding in chrome main directory...

use 'branding_path_component' to simplify branding in chrome main directory (and crash service) - part 2

Also in context of this review crash service is also using 'branding_path_component'

Please take look at
https://codereview.chromium.org/1090213002/patch/40001/50001
for details

BUG=

Review URL: https://codereview.chromium.org/1114453002

Cr-Commit-Position: refs/heads/master@{#327388}

chrome/chrome.gyp

@@ -76,15 +76,8 @@
       ['OS=="linux"', {
         'conditions': [
           ['chromeos==1', {
-            'conditions': [
-              ['branding=="Chrome"', {
-                'platform_locale_settings_grd':
-                    'app/resources/locale_settings_google_chromeos.grd',
-              }, {  # branding!=Chrome
-                'platform_locale_settings_grd':
-                    'app/resources/locale_settings_chromiumos.grd',
-              }],
-            ]
+            'platform_locale_settings_grd':
+                    'app/resources/locale_settings_<(branding_path_component)os.grd',
           }, {  # chromeos==0
             'platform_locale_settings_grd':
                 'app/resources/locale_settings_linux.grd',

chrome/chrome_dll_bundle.gypi

@@ -101,14 +101,8 @@
     },
   ],
   'variables': {
-    'conditions': [
-      ['branding=="Chrome"', {
-        'theme_dir_name': 'google_chrome',
-      }, {  # else: 'branding!="Chrome"
-        'theme_dir_name': 'chromium',
-      }],
-    ],
     'libpeer_target_type%': 'static_library',
+    'theme_dir_name': '<(branding_path_component)',
   },
   'postbuilds': [
     {

chrome/tools/crash_service/caps/caps.gyp

@@ -13,18 +13,8 @@
     {
       'target_name': 'caps_resources',
       'type': 'none',
-      'conditions': [
-        ['branding == "Chrome"', {
-          'variables': {
-             'branding_path': '../../../app/theme/google_chrome/BRANDING',
-          },
-        }, { # else branding!="Chrome"
-          'variables': {
-             'branding_path': '../../../app/theme/chromium/BRANDING',
-          },
-        }],
-      ],
       'variables': {
+        'branding_path': '../../../app/theme/<(branding_path_component)/BRANDING',
         'output_dir': 'caps',
         'template_input_path': '../../../app/chrome_version.rc.version',
       },