Rename Mac/Win GN builders to GYP builders.

scripts/slave/recipe_modules/chromium_tests/chromium_mac.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
 
 SPEC = {
   'settings': {
     'build_gs_bucket': 'chromium-mac-archive',
     # WARNING: src-side runtest.py is only tested with chromium CQ builders.
@@ skipping 84 matching lines @@
         steps.generate_script,
         steps.generate_isolated_script,
       ],
       'bot_type': 'tester',
       'parent_buildername': 'Mac Builder',
       'testing': {
         'platform': 'mac',
       },
     },
     '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',
       'chromium_config_kwargs': {
         'BUILD_CONFIG': 'Release',
         'TARGET_PLATFORM': 'mac',
       },
       'test_generators': [
         steps.generate_gtest,
         steps.generate_script,
         steps.generate_isolated_script,
       ],
       'enable_swarming': True,
@@ skipping 40 matching lines @@
       'parent_buildername': 'Mac Builder (dbg)',
       'testing': {
         'platform': 'mac',
       },
       'enable_swarming': True,
       'swarming_dimensions': {
         'os': 'Mac-10.9',
       },
     },
     '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',
       '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',
       },
     },
   },
 }