Add a product_name of 'chrome' on the non-Mac systems so they can...

chrome/chrome.gyp

 # Copyright (c) 2009 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'variables': {
     'chromium_code': 1,
   },
   'includes': [
     '../build/common.gypi',
@@ skipping 1336 matching lines @@
           # 'branding' is a variable defined in common.gypi
           # (e.g. "Chromium", "Chrome")
           'product_name': '<(branding)',
           'conditions': [
             ['branding=="Chrome"', {
               'mac_bundle_resources': ['app/theme/google_chrome/chrome.icns'],
             }, {  # else: branding!="Chrome"
               'mac_bundle_resources': ['app/theme/chromium/chromium.icns'],
             }],
           ],
+        }, { # else: OS != "mac"
+          'conditions': [
+            ['branding=="Chrome"', {
+              'product_name': 'chrome'
+            }, {  # else: Branding!="Chrome"
+              # TODO:  change to:
+              #   'product_name': 'chromium'
+              # whenever we convert the rest of the infrastructure
+              # (buildbots etc.) to use "gyp -Dbranding=Chrome".
+              'product_name': 'chrome'
+            }],
+          ],
         }],
         ['OS!="win"', {
           'variables': {
             'repack_path': '../tools/data_pack/repack.py',
           },
           'actions': [
             {
               'action_name': 'repack_chrome',
               'variables': {
                 'pak_inputs': [
@@ skipping 400 matching lines @@
               'outputs': [],
               'action_name': 'package_chrome',
               'action': ['tools/mac/package_chrome.sh' ],
             },
           ],  # 'actions'
         },
       ]},  # 'targets'
     ],  # OS=="mac"
   ],  # 'conditions'
 }