Rename Mac/Win GN builders to GYP builders.

scripts/slave/recipe_modules/chromium_tests/chromium_win.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-win-archive',
     # WARNING: src-side runtest.py is only tested with chromium CQ builders.
@@ skipping 131 matching lines @@
       'tests': [
         steps.MiniInstallerTest(),
       ],
       'parent_buildername': 'Win x64 Builder',
       'testing': {
         'platform': 'win',
       },
       'enable_swarming': True,
     },
     'Win8 Aura': {
+      # TODO(dpranke): Remove after masters have restarted.
       'chromium_config': 'chromium',
       'chromium_apply_config': ['mb'],
       'gclient_config': 'chromium',
+      'chromium_config_kwargs': {
+        'BUILD_CONFIG': 'Release',
+        'TARGET_PLATFORM': 'win',
+        'TARGET_BITS': 32,
+      },
+      'test_generators': [
+        steps.generate_gtest,
+        steps.generate_script,
+        steps.generate_isolated_script,
+      ],
+      'enable_swarming': True,
+      'swarming_dimensions': {
+        'cpu': 'x86-64',
+        'os': 'Windows-8.1-SP0',
+      },
+      'testing': {
+        'platform': 'win',
+      },
+    },
+    'Win8 GYP': {
+      'chromium_config': 'chromium',
+      'chromium_apply_config': ['mb'],
+      'gclient_config': 'chromium',
       'chromium_config_kwargs': {
         'BUILD_CONFIG': 'Release',
         'TARGET_PLATFORM': 'win',
         'TARGET_BITS': 32,
       },
       'test_generators': [
         steps.generate_gtest,
         steps.generate_script,
         steps.generate_isolated_script,
       ],
       'enable_swarming': True,
       'swarming_dimensions': {
         'cpu': 'x86-64',
         'os': 'Windows-8.1-SP0',
       },
       'testing': {
         'platform': 'win',
       },
     },
-
     'Win x64 Builder (dbg)': {
       'chromium_config': 'chromium',
       'chromium_apply_config': ['mb', 'ninja_confirm_noop'],
       'gclient_config': 'chromium',
       'chromium_config_kwargs': {
         'BUILD_CONFIG': 'Debug',
         'TARGET_BITS': 64,
       },
       'bot_type': 'builder',
       'compile_targets': [
@@ skipping 38 matching lines @@
         steps.generate_script,
         steps.generate_isolated_script,
       ],
       'parent_buildername': 'Win Builder (dbg)',
       'testing': {
         'platform': 'win',
       },
       'enable_swarming': True,
     },
     'Win8 GN (dbg)': {
+      # TODO(dpranke): Remove after masters have restarted.
       'chromium_config': 'chromium',
       'chromium_apply_config': ['mb'],
       'gclient_config': 'chromium',
+      'chromium_config_kwargs': {
+        'BUILD_CONFIG': 'Debug',
+        'TARGET_PLATFORM': 'win',
+        'TARGET_BITS': 32,
+      },
+      'test_generators': [
+        steps.generate_gtest,
+        steps.generate_script,
+        steps.generate_isolated_script,
+      ],
+      'enable_swarming': True,
+      'testing': {
+        'platform': 'win',
+      },
+    },
+    'Win8 GYP (dbg)': {
+      'chromium_config': 'chromium',
+      'chromium_apply_config': ['mb'],
+      'gclient_config': 'chromium',
       'chromium_config_kwargs': {
         'BUILD_CONFIG': 'Debug',
         'TARGET_PLATFORM': 'win',
         'TARGET_BITS': 32,
       },
       'test_generators': [
         steps.generate_gtest,
         steps.generate_script,
         steps.generate_isolated_script,
       ],
@@ skipping 20 matching lines @@
         'platform': 'win',
       },
       'use_isolate': True,
       'enable_swarming': True,
       # Workaround so that recipes doesn't add random build targets to our
       # compile line. We want to build everything.
       'add_tests_as_compile_targets': False,
     },
   },
 }