Revert of Flip main remaining Win builders 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 c7ccdcf10e8515696f951eec3b53fc1aea341272..d9a8204ac80bc77e67b7a4144a089caea6852db3 100644
--- a/tools/mb/mb_config.pyl
+++ b/tools/mb/mb_config.pyl
@@ -15,7 +15,7 @@
       'Android': 'android_without_codecs_gn_release_bot_minimal_symbols',
       'Linux x64': 'noswarming_gn_release_bot',
       'Mac': 'noswarming_gyp_release_bot_mac_strip',
-      'Win': 'noswarming_gn_release_bot_minimal_symbols_x86',
+      'Win': 'noswarming_gyp_release_bot_minimal_symbols_x86',
       'Win x64': 'noswarming_gn_release_bot_minimal_symbols_x64',
     },
 
@@ -509,7 +509,7 @@
       'Win 8 Perf (3)': 'none',
       'Win 8 Perf (4)': 'none',
       'Win 8 Perf (5)': 'none',
-      'Win Builder': 'gn_official_goma_minimal_symbols_x86',
+      'Win Builder': 'gyp_official_goma_minimal_symbols_x86',
       'Win Zenbook Perf (1)': 'none',
       'Win Zenbook Perf (2)': 'none',
       'Win Zenbook Perf (3)': 'none',
@@ -617,10 +617,10 @@
 
       # Currently the official bots set mini_installer_official_deps=1
       # but it's not clear if that's actually used anywhere.
-      'win': 'gn_official',
+      'win': 'gyp_official',
       'win-asan': 'gyp_official_syzyasan',
       'win-pgo': 'gyp_official_winpgo',
-      'win64': 'gn_official_x64',
+      'win64': 'gyp_official_x64',
       'win64-pgo': 'gyp_official_winpgo_x64',
     },
 
@@ -633,7 +633,7 @@
       'precise64 trunk': 'gn_official',
       'win beta': 'gyp_official_six_concurrent_links',
       'win stable': 'gyp_official_six_concurrent_links',
-      'win trunk': 'gn_official_six_concurrent_links',
+      'win trunk': 'gyp_official_six_concurrent_links',
     },
 
     'tryserver.blink': {
@@ -1140,6 +1140,10 @@
       'gn', 'official', 'goma', 'minimal_symbols', 'x86',
     ],
 
+    'gyp_official_goma_minimal_symbols_x86': [
+      'gyp', 'official', 'goma', 'minimal_symbols', 'x86',
+    ],
+
     'gn_release_bot': [
       'gn', 'release_bot',
     ],
@@ -1318,10 +1322,6 @@
 
     'gyp_official_syzyasan': [
       'gyp', 'official', 'syzyasan',
-    ],
-
-    'gn_official_six_concurrent_links': [
-      'gn', 'official', 'six_concurrent_links',
     ],
 
     'gyp_official_six_concurrent_links': [
@@ -1338,8 +1338,8 @@
       'gyp', 'error', 'x64',
     ],
 
-    'gn_official_x64': [
-      'gn', 'official', 'x64',
+    'gyp_official_x64': [
+      'gyp', 'official', 'x64',
     ],
 
     'gyp_release_bot': [
@@ -1415,6 +1415,10 @@
 
     'noswarming_gn_release_bot_minimal_symbols_x86': [
       'noswarming', 'gn', 'release_bot', 'minimal_symbols', 'x86',
+    ],
+
+    'noswarming_gyp_release_bot_minimal_symbols_x86': [
+      'noswarming', 'gyp', 'release_bot', 'minimal_symbols', 'x86',
     ],
 
     'noswarming_gn_release_bot_x64': [