Revert of Download the hermetic xcode toolchain on all bots that target mac.

scripts/slave/recipe_modules/chromium_tests/chromium_fyi.py

 # Copyright 2014 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.
 
 from . import steps
 
 RESULTS_URL = 'https://chromeperf.appspot.com'
 
 
 KITCHEN_TEST_SPEC = {
@@ skipping 24 matching lines @@
   'settings': {
     'build_gs_bucket': 'chromium-fyi-archive',
   },
   'builders': {
     'Chromium Mac 10.10 MacViews': {
       'chromium_config': 'chromium',
       'gclient_config': 'chromium',
       'chromium_apply_config': [
         'chromium_mac_mac_views',
         'mb',
+        'force_mac_toolchain'
       ],
       'chromium_config_kwargs': {
         'BUILD_CONFIG': 'Release',
         'TARGET_BITS': 64,
       },
       'checkout_dir': 'mac',
       'testing': {
         'platform': 'mac',
       },
     },
     'Chromium Mac 10.11': {
       'chromium_config': 'chromium',
-      'chromium_apply_config': ['mb'],
+      'chromium_apply_config': ['mb', 'force_mac_toolchain'],
       'gclient_config': 'chromium',
       'chromium_config_kwargs': {
         'BUILD_CONFIG': 'Release',
         'TARGET_BITS': 64,
       },
       'testing': {
         'platform': 'mac',
       },
     },
     'Chromium Mac 10.11 Force Mac Toolchain': {
       'chromium_config': 'chromium',
-      'chromium_apply_config': ['mb'],
+      'chromium_apply_config': ['mb', 'force_mac_toolchain'],
       'gclient_config': 'chromium',
       'chromium_config_kwargs': {
         'BUILD_CONFIG': 'Release',
         'TARGET_BITS': 64,
       },
       'testing': {
         'platform': 'mac',
       },
     },
     'Linux ARM': {
@@ skipping 164 matching lines @@
         steps.PrintPreviewTests(),
       ],
       'bot_type': 'builder_tester',
       'testing': {
         'platform': 'linux',
       },
     },
     'Print Preview Mac': {
       'chromium_config': 'chromium',
       'gclient_config': 'chromium',
+      'chromium_apply_config': ['force_mac_toolchain'],
       'GYP_DEFINES': {
         'component': 'shared_library',
       },
       'chromium_config_kwargs': {
         'BUILD_CONFIG': 'Release',
         'TARGET_PLATFORM': 'mac',
         'TARGET_BITS': 64,
       },
       'tests': [
         steps.PrintPreviewTests(),
@@ skipping 128 matching lines @@
         'TARGET_BITS': 64,
       },
       'bot_type': 'builder_tester',
       'testing': {
         'platform': 'linux',
       },
     },
     'Mac OpenSSL': {
       'chromium_config': 'chromium',
       'gclient_config': 'chromium',
+      'chromium_apply_config': ['force_mac_toolchain'],
       'chromium_config_kwargs': {
         'BUILD_CONFIG': 'Release',
         'TARGET_BITS': 32,
       },
       'GYP_DEFINES': {
         'use_openssl': '1',
       },
       'testing': {
         'platform': 'mac',
       },
@@ skipping 703 matching lines @@
       },
       'compile_targets': [ 'chromium_builder_tests' ],
       'goma_canary': True,
       'tests': steps.GOMA_TESTS,
       'testing': {
         'platform': 'linux'
       }
     },
     'Chromium Mac 10.9 Goma Canary': {
       'chromium_config': 'chromium',
-      'chromium_apply_config': ['goma_canary', 'mb'],
+      'chromium_apply_config': ['goma_canary', 'mb', 'force_mac_toolchain'],
       'gclient_config': 'chromium',
       'chromium_config_kwargs': {
         'BUILD_CONFIG': 'Release',
         'TARGET_BITS': 64,
       },
       'compile_targets': [ 'chromium_builder_tests' ],
       'goma_canary': True,
       'tests': steps.GOMA_TESTS,
       'testing': {
         'platform': 'mac'
       }
     },
     'Chromium Mac 10.9 Goma Canary (dbg)': {
       'chromium_config': 'chromium',
-      'chromium_apply_config': ['goma_canary', 'mb'],
+      'chromium_apply_config': ['goma_canary', 'mb', 'force_mac_toolchain'],
       'gclient_config': 'chromium',
       'chromium_config_kwargs': {
         'BUILD_CONFIG': 'Debug',
         'TARGET_BITS': 64,
       },
       'compile_targets': [ 'chromium_builder_tests' ],
       'goma_canary': True,
       'tests': steps.GOMA_TESTS,
       'testing': {
         'platform': 'mac'
       }
     },
     'Chromium Mac 10.9 Goma Canary (clobber)': {
       'chromium_config': 'chromium',
       'chromium_apply_config': [
         'clobber',
         'goma_canary',
         'mb',
+        'force_mac_toolchain',
       ],
       'gclient_config': 'chromium',
       'chromium_config_kwargs': {
         'BUILD_CONFIG': 'Release',
         'TARGET_BITS': 64,
       },
       'compile_targets': [ 'chromium_builder_tests' ],
       'goma_canary': True,
       'tests': steps.GOMA_TESTS,
       'testing': {
         'platform': 'mac'
       }
     },
     'Chromium Mac 10.9 Goma Canary (dbg)(clobber)': {
       'chromium_config': 'chromium',
       'chromium_apply_config': [
         'clobber',
         'goma_canary',
         'mb',
+        'force_mac_toolchain',
       ],
       'gclient_config': 'chromium',
       'chromium_config_kwargs': {
         'BUILD_CONFIG': 'Debug',
         'TARGET_BITS': 64,
       },
       'compile_targets': [ 'chromium_builder_tests' ],
       'goma_canary': True,
       'tests': steps.GOMA_TESTS,
       'testing': {
@@ skipping 864 matching lines @@
         'TARGET_PLATFORM': 'win',
         'TARGET_BITS': 32,
       },
       'bot_type': 'builder_tester',
       'testing': { 'platform': 'win', },
       'use_isolate': True,
       'enable_swarming': True,
     },
   },
 }