Flip Mac CQ bots and matching waterfall 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 b970be11d4c6bb63b98b33bb73d7c9c119ce26be..b27d971ffca22362d209fb92a3f428a51634c78a 100644
--- a/tools/mb/mb_config.pyl
+++ b/tools/mb/mb_config.pyl
@@ -226,8 +226,8 @@
 
     'chromium.gpu': {
       # These all use the 'trybot' mixins to ensure that dcheck is on.
-      'GPU Mac Builder': 'swarming_gpu_tests_gyp_release_trybot',
-      'GPU Mac Builder (dbg)': 'swarming_gpu_tests_gyp_debug_trybot',
+      'GPU Mac Builder': 'swarming_gpu_tests_gn_release_trybot',
+      'GPU Mac Builder (dbg)': 'swarming_gpu_tests_gn_debug_trybot',
       'GPU Linux Builder (dbg)': 'swarming_gpu_tests_gn_debug_trybot',
       'GPU Linux Builder': 'swarming_gpu_tests_gn_release_trybot',
       'GPU Win Builder': 'swarming_gpu_tests_gn_release_trybot_x86',
@@ -252,8 +252,8 @@
       'Android Release (Nexus 9)': 'android_gn_release_trybot_arm64',
       'GPU Linux Builder (dbg)': 'swarming_gpu_fyi_tests_gn_debug_trybot',
       'GPU Linux Builder': 'swarming_gpu_fyi_tests_gn_release_trybot',
-      'GPU Mac Builder': 'swarming_gpu_fyi_tests_gyp_release_trybot',
-      'GPU Mac Builder (dbg)': 'swarming_gpu_fyi_tests_gyp_debug_trybot',
+      'GPU Mac Builder': 'swarming_gpu_fyi_tests_gn_release_trybot',
+      'GPU Mac Builder (dbg)': 'swarming_gpu_fyi_tests_gn_debug_trybot',
       'GPU Win Builder': 'swarming_gpu_tests_deqp_gles_gyp_release_trybot_x86',
       'GPU Win Builder (dbg)':
         'swarming_gpu_tests_deqp_gles_gyp_debug_trybot_x86',
@@ -799,13 +799,13 @@
       'mac_chromium_archive_rel_ng': 'noswarming_gyp_release_trybot',
       'mac_chromium_asan_rel_ng': 'swarming_asan_dcheck_gyp_release_bot',
       'mac_chromium_asan_variable': 'findit',
-      'mac_chromium_compile_dbg_ng': 'swarming_gyp_debug_trybot',
-      'mac_chromium_compile_rel_ng': 'swarming_gpu_tests_gyp_release_trybot',
-      'mac_chromium_dbg_ng': 'swarming_gyp_debug_trybot',
+      'mac_chromium_compile_dbg_ng': 'swarming_gn_debug_trybot',
+      'mac_chromium_compile_rel_ng': 'swarming_gpu_tests_gn_release_trybot',
+      'mac_chromium_dbg_ng': 'swarming_gn_debug_trybot',
       'mac_chromium_gn_dbg': 'gn_debug_bot',
       'mac_chromium_gn_rel': 'gn_release_trybot',
       'mac_chromium_gn_upload': 'gn_release_bot',
-      'mac_chromium_rel_ng': 'swarming_gpu_tests_gyp_release_trybot',
+      'mac_chromium_rel_ng': 'swarming_gpu_tests_gn_release_trybot',
       'mac_chromium_variable': 'findit',
       'mac_chromium_variable_10.10': 'findit',
       'mac_chromium_variable_10.10_macviews': 'findit',
@@ -1683,10 +1683,6 @@
       'swarming', 'gpu_tests', 'gn', 'release_trybot', 'x86',
     ],
 
-    'swarming_gpu_tests_gyp_debug_trybot': [
-      'swarming', 'gpu_tests', 'gyp', 'debug_trybot',
-    ],
-
     'swarming_gpu_tests_gyp_release_bot': [
       'swarming', 'gpu_tests', 'gyp', 'release_bot',
     ],
@@ -1841,10 +1837,6 @@
       'swarming', 'gyp', 'debug_bot',
     ],
 
-    'swarming_gyp_debug_trybot': [
-      'swarming', 'gyp', 'debug_trybot',
-    ],
-
     'swarming_gn_release_trybot_arm': [
       'swarming', 'gn', 'release_trybot', 'arm', 'crosscompile',
     ],