Rename Mac/Win GN builders to GYP builders.

scripts/slave/recipe_modules/chromium_tests/chromium_win.py

Index: scripts/slave/recipe_modules/chromium_tests/chromium_win.py
diff --git a/scripts/slave/recipe_modules/chromium_tests/chromium_win.py b/scripts/slave/recipe_modules/chromium_tests/chromium_win.py
index 806bfbd586fe7b54e6811904cd0aab21d1ed45c5..8e6adfbd5bab2033099203c55171abf09e2470a1 100644
--- a/scripts/slave/recipe_modules/chromium_tests/chromium_win.py
+++ b/scripts/slave/recipe_modules/chromium_tests/chromium_win.py
@@ -149,6 +149,30 @@ SPEC = {
       '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',
@@ -171,7 +195,6 @@ SPEC = {
         'platform': 'win',
       },
     },
-
     'Win x64 Builder (dbg)': {
       'chromium_config': 'chromium',
       'chromium_apply_config': ['mb', 'ninja_confirm_noop'],
@@ -230,6 +253,26 @@ SPEC = {
       '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',