use 'branding_path_component' to simplify branding in chrome directory - part 1

chrome/chrome_exe.gypi

Index: chrome/chrome_exe.gypi
diff --git a/chrome/chrome_exe.gypi b/chrome/chrome_exe.gypi
index 11a42f3d11878463318fa39652296739218ea6d0..70a4592bb71e2d1df713c3d49794bbdb2b01c1c9 100644
--- a/chrome/chrome_exe.gypi
+++ b/chrome/chrome_exe.gypi
@@ -179,17 +179,8 @@
                   'files': ['tools/build/linux/chrome-wrapper',
                             '../third_party/xdg-utils/scripts/xdg-mime',
                             '../third_party/xdg-utils/scripts/xdg-settings',
+                            'app/theme/<(branding_path_component)/product_logo_48.png',
                             ],
-                  # The wrapper script above may need to generate a .desktop
-                  # file, which requires an icon. So, copy one next to the
-                  # script.
-                  'conditions': [
-                    ['branding=="Chrome"', {
-                      'files': ['app/theme/google_chrome/product_logo_48.png']
-                    }, { # else: 'branding!="Chrome"
-                      'files': ['app/theme/chromium/product_logo_48.png']
-                    }],
-                  ],
                 },
               ],
             }],
@@ -225,22 +216,7 @@
           ],
         }],
         ['OS=="mac"', {
-          # 'branding' is a variable defined in common.gypi
-          # (e.g. "Chromium", "Chrome")
           'conditions': [
-            ['branding=="Chrome"', {
-              'mac_bundle_resources': [
-                'app/theme/google_chrome/mac/app.icns',
-                'app/theme/google_chrome/mac/document.icns',
-                'browser/ui/cocoa/applescript/scripting.sdef',
-              ],
-            }, {  # else: 'branding!="Chrome"
-              'mac_bundle_resources': [
-                'app/theme/chromium/mac/app.icns',
-                'app/theme/chromium/mac/document.icns',
-                'browser/ui/cocoa/applescript/scripting.sdef',
-              ],
-            }],
             ['mac_breakpad==1', {
               'variables': {
                 # A real .dSYM is needed for dump_syms to operate on.
@@ -305,6 +281,9 @@
             'chrome_dll',
           ],
           'mac_bundle_resources': [
+            'app/theme/<(branding_path_component)/mac/app.icns',
+            'app/theme/<(branding_path_component)/mac/document.icns',
+            'browser/ui/cocoa/applescript/scripting.sdef',
             '<(PRODUCT_DIR)/<(mac_bundle_id).manifest',
           ],
           'actions': [