Rename Mac/Win GN builders to GYP builders.

scripts/slave/recipe_modules/chromium_tests/chromium_mac.py

Index: scripts/slave/recipe_modules/chromium_tests/chromium_mac.py
diff --git a/scripts/slave/recipe_modules/chromium_tests/chromium_mac.py b/scripts/slave/recipe_modules/chromium_tests/chromium_mac.py
index 7053f170cc1fe54b8d50e367f044d8b715ac74e4..ece170b454193f65912b3d9dfa701657684f792e 100644
--- a/scripts/slave/recipe_modules/chromium_tests/chromium_mac.py
+++ b/scripts/slave/recipe_modules/chromium_tests/chromium_mac.py
@@ -102,6 +102,25 @@ SPEC = {
       },
     },
     'Mac GN': {
+      # TODO(dpranke): Remove after builders have restarted.
+      'chromium_config': 'chromium',
+      'chromium_apply_config': ['mb', 'force_mac_toolchain'],
+      'gclient_config': 'chromium',
+      'chromium_config_kwargs': {
+        'BUILD_CONFIG': 'Release',
+        'TARGET_PLATFORM': 'mac',
+      },
+      'test_generators': [
+        steps.generate_gtest,
+        steps.generate_script,
+        steps.generate_isolated_script,
+      ],
+      'enable_swarming': True,
+      'testing': {
+        'platform': 'mac',
+      },
+    },
+    'Mac GYP': {
       'chromium_config': 'chromium',
       'chromium_apply_config': ['mb', 'force_mac_toolchain'],
       'gclient_config': 'chromium',
@@ -165,6 +184,25 @@ SPEC = {
       },
     },
     'Mac GN (dbg)': {
+      # TODO(dpranke): Remove after builders have restarted.
+      'chromium_config': 'chromium',
+      'chromium_apply_config': ['mb', 'force_mac_toolchain'],
+      'gclient_config': 'chromium',
+      'chromium_config_kwargs': {
+        'BUILD_CONFIG': 'Debug',
+        'TARGET_PLATFORM': 'mac',
+      },
+      'test_generators': [
+        steps.generate_gtest,
+        steps.generate_script,
+        steps.generate_isolated_script,
+      ],
+      'enable_swarming': True,
+      'testing': {
+        'platform': 'mac',
+      },
+    },
+    'Mac GYP (dbg)': {
       'chromium_config': 'chromium',
       'chromium_apply_config': ['mb', 'force_mac_toolchain'],
       'gclient_config': 'chromium',