Re-land r404744 - Flip remaining Mac bots to GN.

tools/mb/mb_config.pyl

Index: tools/mb/mb_config.pyl
diff --git a/tools/mb/mb_config.pyl b/tools/mb/mb_config.pyl
index c7ccdcf10e8515696f951eec3b53fc1aea341272..7fbd3783955b568c225bbf51acee5e5295cd79d3 100644
--- a/tools/mb/mb_config.pyl
+++ b/tools/mb/mb_config.pyl
@@ -14,7 +14,7 @@
     'chromium': {
       'Android': 'android_without_codecs_gn_release_bot_minimal_symbols',
       'Linux x64': 'noswarming_gn_release_bot',
-      'Mac': 'noswarming_gyp_release_bot_mac_strip',
+      'Mac': 'noswarming_gn_release_bot_mac_strip',
       'Win': 'noswarming_gn_release_bot_minimal_symbols_x86',
       'Win x64': 'noswarming_gn_release_bot_minimal_symbols_x64',
     },
@@ -63,7 +63,7 @@
     'chromium.chrome': {
       'Google Chrome ChromeOS': 'gn_official_goma_chromeos',
       'Google Chrome Linux x64': 'gn_official_goma',
-      'Google Chrome Mac': 'gyp_official_goma',
+      'Google Chrome Mac': 'gn_official_goma',
       'Google Chrome Win': 'gn_official_goma_minimal_symbols_x86',
     },
 
@@ -461,7 +461,7 @@
       'Mac 10.11 Perf (3)': 'none',
       'Mac 10.11 Perf (4)': 'none',
       'Mac 10.11 Perf (5)': 'none',
-      'Mac Builder': 'gyp_official_goma',
+      'Mac Builder': 'gn_official_goma',
       'Mac HDD Perf (1)': 'none',
       'Mac HDD Perf (2)': 'none',
       'Mac HDD Perf (3)': 'none',
@@ -612,7 +612,7 @@
 
     'official.desktop': {
       'blimp-engine': '//build/args/bots/official.desktop/blimp-engine.gn',
-      'mac64': 'gyp_official',
+      'mac64': 'gn_official',
       'precise64': 'gn_official',
 
       # Currently the official bots set mini_installer_official_deps=1
@@ -627,7 +627,7 @@
     'official.desktop.continuous': {
       'mac beta': 'gyp_official',
       'mac stable': 'gyp_official',
-      'mac trunk': 'gyp_official',
+      'mac trunk': 'gn_official',
       'precise64 beta': 'gn_official',
       'precise64 stable': 'gn_official',
       'precise64 trunk': 'gn_official',
@@ -1425,10 +1425,6 @@
       'noswarming', 'gn', 'release_bot', 'mac_strip',
     ],
 
-    'noswarming_gyp_release_bot_mac_strip': [
-      'noswarming', 'gyp', 'release_bot', 'mac_strip',
-    ],
-
     'noswarming_gn_release_trybot_x64': [
       'noswarming', 'gn', 'release_trybot', 'x64',
     ],