Re-land "Flip remaining CQ 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 5770a305b119e57dd37340a8b7e5a73a8e3ed3c4..4f92465d45de3e34ec1a6dd8de6aea8ff67959bc 100644
--- a/tools/mb/mb_config.pyl
+++ b/tools/mb/mb_config.pyl
@@ -233,8 +233,8 @@
       'GPU Mac Builder (dbg)': 'swarming_gpu_tests_gyp_debug_trybot',
       'GPU Linux Builder (dbg)': 'swarming_gpu_tests_gn_debug_trybot',
       'GPU Linux Builder': 'swarming_gpu_tests_gn_release_trybot',
-      'GPU Win Builder': 'swarming_gpu_tests_gyp_release_trybot_x86',
-      'GPU Win Builder (dbg)': 'swarming_gpu_tests_gyp_debug_trybot_x86',
+      'GPU Win Builder': 'swarming_gpu_tests_gn_release_trybot_x86',
+      'GPU Win Builder (dbg)': 'swarming_gpu_tests_gn_debug_trybot_x86',
       'Linux Debug (NVIDIA)': 'none',
       'Linux Release (NVIDIA)': 'none',
       'Mac 10.10 Debug (Intel)': 'none',
@@ -593,8 +593,8 @@
 
     'chromium.win': {
       # Windows bots take too long to link w/ full symbols and time out.
-      'Win Builder': 'swarming_gyp_release_bot_minimal_symbols_x86',
-      'Win Builder (dbg)': 'swarming_gyp_debug_bot_minimal_symbols_x86',
+      'Win Builder': 'swarming_gn_release_bot_minimal_symbols_x86',
+      'Win Builder (dbg)': 'swarming_gn_debug_bot_minimal_symbols_x86',
       'Win x64 Builder': 'swarming_gn_release_bot_minimal_symbols_x64',
       'Win x64 Builder (dbg)': 'swarming_gn_debug_bot_minimal_symbols_x64',
       'Win 7 Tests x64 (1)': 'none',
@@ -847,11 +847,11 @@
       'win8_chromium_ng': 'gn_release_trybot_x86',
       'win_x64_archive': 'noswarming_gyp_release_trybot_x64',
       'win_archive': 'noswarming_gyp_release_trybot_x86',
-      'win_chromium_compile_dbg_ng': 'swarming_gyp_debug_trybot_x86',
+      'win_chromium_compile_dbg_ng': 'swarming_gn_debug_trybot_x86',
       'win_chromium_compile_rel_ng':
-        'swarming_gpu_tests_gyp_release_trybot_x86',
-      'win_chromium_dbg_ng': 'swarming_gyp_debug_trybot_x86',
-      'win_chromium_rel_ng': 'swarming_gpu_tests_gyp_release_trybot_x86',
+        'swarming_gpu_tests_gn_release_trybot_x86',
+      'win_chromium_dbg_ng': 'swarming_gn_debug_trybot_x86',
+      'win_chromium_rel_ng': 'swarming_gpu_tests_gn_release_trybot_x86',
       'win_chromium_syzyasan_rel': 'swarming_gyp_syzyasan_release_trybot_x86',
       'win_chromium_variable': 'findit',
       'win_chromium_variable_archive': 'findit',
@@ -1534,6 +1534,10 @@
       'swarming', 'gn', 'debug_bot', 'x86',
     ],
 
+    'swarming_gn_debug_bot_minimal_symbols_x86': [
+      'swarming', 'gn', 'debug_bot_minimal_symbols', 'x86',
+    ],
+
     'swarming_gn_debug_trybot': [
       'swarming', 'gn', 'debug_trybot',
     ],
@@ -1562,6 +1566,10 @@
       'swarming', 'gn', 'release_bot_minimal_symbols', 'x64',
     ],
 
+    'swarming_gn_release_bot_minimal_symbols_x86': [
+      'swarming', 'gn', 'release_bot_minimal_symbols', 'x86',
+    ],
+
     'swarming_gn_release_bot_x64': [
       'swarming', 'gn', 'release_bot', 'x64',
     ],
@@ -1628,16 +1636,20 @@
       'swarming', 'gpu_tests', 'gn', 'debug_trybot',
     ],
 
+    'swarming_gpu_tests_gn_debug_trybot_x86': [
+      'swarming', 'gpu_tests', 'gn', 'debug_trybot', 'x86',
+    ],
+
     'swarming_gpu_tests_gn_release_trybot': [
       'swarming', 'gpu_tests', 'gn', 'release_trybot',
     ],
 
-    'swarming_gpu_tests_gyp_debug_trybot': [
-      'swarming', 'gpu_tests', 'gyp', 'debug_trybot',
+    'swarming_gpu_tests_gn_release_trybot_x86': [
+      'swarming', 'gpu_tests', 'gn', 'release_trybot', 'x86',
     ],
 
-    'swarming_gpu_tests_gyp_debug_trybot_x86': [
-      'swarming', 'gpu_tests', 'gyp', 'debug_trybot', 'x86',
+    'swarming_gpu_tests_gyp_debug_trybot': [
+      'swarming', 'gpu_tests', 'gyp', 'debug_trybot',
     ],
 
     'swarming_gpu_tests_gyp_release_bot': [
@@ -1656,10 +1668,6 @@
       'swarming', 'gpu_tests', 'gyp', 'release_trybot',
     ],
 
-    'swarming_gpu_tests_gyp_release_trybot_x86': [
-      'swarming', 'gpu_tests', 'gyp', 'release_trybot', 'x86',
-    ],
-
     ('swarming_gyp_asan_clang_edge_fuzzer'
          '_static_v8_heap_x86_full_symbols_release'): [
       'swarming', 'gyp', 'asan', 'clang_tot', 'edge', 'fuzzer', 'static',