Move mac_bundle_id and other variables from chrome.gyp to build/chrome_settings.gypi.

chrome/chrome.gyp

 # Copyright (c) 2012 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,
 
     # Define the common dependencies that contain all the actual
     # Chromium functionality.  This list gets pulled in below by
     # the link of the actual chrome (or chromium) executable on
     # Linux or Mac, and into chrome.dll on Windows.
     # NOTE: Most new includes should go in the OS!="ios" condition below.
     'chromium_browser_dependencies': [
       'common',
       'browser',
       '../sync/sync.gyp:sync',
     ],
     'chromium_child_dependencies': [
       'common',
       '../sync/sync.gyp:sync',
     ],
     'allocator_target': '../base/allocator/allocator.gyp:allocator',
     'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome',
     'protoc_out_dir': '<(SHARED_INTERMEDIATE_DIR)/protoc_out',
     'repack_locales_cmd': ['python', 'tools/build/repack_locales.py'],
-    # TODO: remove this helper when we have loops in GYP
-    'apply_locales_cmd': ['python', '<(DEPTH)/build/apply_locales.py'],
     'conditions': [
       ['OS!="ios"', {
         'chromium_browser_dependencies': [
           '../ppapi/ppapi_internal.gyp:ppapi_host',
         ],
         'chromium_child_dependencies': [
           'debugger',
           'plugin',
           'renderer',
           'utility',
@@ skipping 36 matching lines @@
         ],
       },],
       ['os_posix == 1 and OS != "mac" and OS != "ios" and OS != "linux"', {
         'platform_locale_settings_grd':
             'app/resources/locale_settings_linux.grd',
       },],
       ['OS=="mac"', {
         'tweak_info_plist_path': '../build/mac/tweak_info_plist.py',
         'platform_locale_settings_grd':
             'app/resources/locale_settings_mac.grd',
-        'conditions': [
-          ['branding=="Chrome"', {
-            'mac_bundle_id': 'com.google.Chrome',
-            'mac_creator': 'rimZ',
-            # The policy .grd file also needs the bundle id.
-            'grit_defines': ['-D', 'mac_bundle_id=com.google.Chrome'],
-          }, {  # else: branding!="Chrome"
-            'mac_bundle_id': 'org.chromium.Chromium',
-            'mac_creator': 'Cr24',
-            # The policy .grd file also needs the bundle id.
-            'grit_defines': ['-D', 'mac_bundle_id=org.chromium.Chromium'],
-          }],  # branding
-        ],  # conditions
       }],  # OS=="mac"
     ],  # conditions
   },  # variables
   'includes': [
     # Place some targets in gypi files to reduce contention on this file.
     # By using an include, we keep everything in a single xcodeproj file.
     # Note on Win64 targets: targets that end with win64 be used
     # on 64-bit Windows only. Targets that end with nacl_win64 should be used
     # by Native Client only.
     # NOTE: Most new includes should go in the OS!="ios" condition below.
+    '../build/chrome_settings.gypi',
     '../build/win_precompile.gypi',
     'chrome_browser.gypi',
     'chrome_browser_ui.gypi',
     'chrome_common.gypi',
     'chrome_installer_util.gypi',
     'version.gypi',
     '../components/nacl/nacl_defines.gypi',
   ],
   'conditions': [
     ['OS!="ios"', {
@@ skipping 1009 matching lines @@
               'sources': [
                 'service/cloud_print/print_system_dummy.cc',
               ],
             }],
           ],
         },
       ],
     }],
   ],  # 'conditions'
 }