Enable hermetic builds for FYI mac builders.

scripts/slave/recipe_modules/chromium_tests/chromium_fyi.py

Index: scripts/slave/recipe_modules/chromium_tests/chromium_fyi.py
diff --git a/scripts/slave/recipe_modules/chromium_tests/chromium_fyi.py b/scripts/slave/recipe_modules/chromium_tests/chromium_fyi.py
index 5e797af59dc81cb98ee2ecd1b4b69c887637f681..8e673358748fc2b718f5105d35ad34efa1598ab1 100644
--- a/scripts/slave/recipe_modules/chromium_tests/chromium_fyi.py
+++ b/scripts/slave/recipe_modules/chromium_tests/chromium_fyi.py
@@ -43,7 +43,11 @@ SPEC = {
     'Chromium Mac 10.10 MacViews': {
       'chromium_config': 'chromium',
       'gclient_config': 'chromium',
-      'chromium_apply_config': ['chromium_mac_mac_views', 'mb'],
+      'chromium_apply_config': [
+        'chromium_mac_mac_views',
+        'mb',
+        'force_mac_toolchain'

[erikchen, 2016/05/03 16:48:57]

You probably need to run

"""
./scripts/slave/unittests/recipe_simulation_test.py train    
"""

which updates some expectations.

[justincohen, 2016/05/03 17:32:58]

Done.

+      ],
       'chromium_config_kwargs': {
         'BUILD_CONFIG': 'Release',
         'TARGET_BITS': 64,
@@ -59,7 +63,7 @@ SPEC = {
     },
     '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',
@@ -73,23 +77,6 @@ SPEC = {
         'platform': 'mac',
       },
     },
-    'Chromium Mac 10.11 Force Mac Toolchain': {
-      'chromium_config': 'chromium',
-      'chromium_apply_config': ['mb'],
-      'gclient_config': 'chromium',
-      'chromium_config_kwargs': {
-        'BUILD_CONFIG': 'Release',
-        'TARGET_BITS': 64,
-      },
-      'chromium_apply_config': ['force_mac_toolchain'],
-      'test_generators': [
-        steps.generate_gtest,
-        steps.generate_script,
-      ],
-      'testing': {
-        'platform': 'mac',
-      },
-    },
     'Linux ARM': {
       'chromium_config': 'chromium',
       'gclient_config': 'chromium',
@@ -260,6 +247,7 @@ SPEC = {
     'Print Preview Mac': {
       'chromium_config': 'chromium',
       'gclient_config': 'chromium',
+      'chromium_apply_config': ['force_mac_toolchain'],
       'GYP_DEFINES': {
         'component': 'shared_library',
       },
@@ -380,6 +368,7 @@ SPEC = {
     'Mac OpenSSL': {
       'chromium_config': 'chromium',
       'gclient_config': 'chromium',
+      'chromium_apply_config': ['force_mac_toolchain'],
       'chromium_config_kwargs': {
         'BUILD_CONFIG': 'Release',
         'TARGET_BITS': 32,
@@ -1149,7 +1138,7 @@ SPEC = {
     },
     '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',
@@ -1164,7 +1153,7 @@ SPEC = {
     },
     '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',
@@ -1179,7 +1168,12 @@ SPEC = {
     },
     'Chromium Mac 10.9 Goma Canary (clobber)': {
       'chromium_config': 'chromium',
-      'chromium_apply_config': ['clobber', 'goma_canary', 'mb'],
+      'chromium_apply_config': [
+        'clobber',
+        'goma_canary',
+        'mb',
+        'force_mac_toolchain',
+      ],
       'gclient_config': 'chromium',
       'chromium_config_kwargs': {
         'BUILD_CONFIG': 'Release',
@@ -1194,7 +1188,12 @@ SPEC = {
     },
     'Chromium Mac 10.9 Goma Canary (dbg)(clobber)': {
       'chromium_config': 'chromium',
-      'chromium_apply_config': ['clobber', 'goma_canary', 'mb'],
+      'chromium_apply_config': [
+        'clobber',
+        'goma_canary',
+        'mb',
+        'force_mac_toolchain',
+      ],
       'gclient_config': 'chromium',
       'chromium_config_kwargs': {
         'BUILD_CONFIG': 'Debug',
@@ -1413,7 +1412,7 @@ SPEC = {
     'ClangToTMac': {
       'chromium_config': 'clang_tot_mac',
       'gclient_config': 'chromium',
-      'chromium_apply_config': ['mb'],
+      'chromium_apply_config': ['mb', 'force_mac_toolchain'],
       'chromium_config_kwargs': {
         'BUILD_CONFIG': 'Release',
         'TARGET_BITS': 64,
@@ -1437,6 +1436,7 @@ SPEC = {
     },
     'ClangToTMac tester': {
       'chromium_config': 'chromium_no_goma',
+      'chromium_apply_config': ['force_mac_toolchain'],
       'gclient_config': 'chromium',
       'chromium_config_kwargs': {
         'BUILD_CONFIG': 'Release',
@@ -1456,7 +1456,7 @@ SPEC = {
     },
     'ClangToTMac (dbg)': {
       'chromium_config': 'clang_tot_mac',
-      'chromium_apply_config': ['mb'],
+      'chromium_apply_config': ['mb', 'force_mac_toolchain'],
       'gclient_config': 'chromium',
       'chromium_config_kwargs': {
         'BUILD_CONFIG': 'Debug',
@@ -1478,7 +1478,7 @@ SPEC = {
     },
     'ClangToTMacASan': {
       'chromium_config': 'clang_tot_mac_asan',
-      'chromium_apply_config': ['mb'],
+      'chromium_apply_config': ['mb', 'force_mac_toolchain'],
       'gclient_config': 'chromium',
       'chromium_config_kwargs': {
         'BUILD_CONFIG': 'Release',
@@ -1501,6 +1501,7 @@ SPEC = {
     'ClangToTMacASan tester': {
       'chromium_config': 'chromium_mac_asan',
       'gclient_config': 'chromium',
+      'chromium_apply_config': ['force_mac_toolchain'],
       'chromium_config_kwargs': {
         'BUILD_CONFIG': 'Release',
         'TARGET_BITS': 64,