Flip misc. remaining Win FYI builders to GN.

tools/mb/mb_config.pyl

 # Copyright 2015 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.
 
 {
   # This is a map of buildbot master names -> buildbot builder names ->
   # config names (where each config name is a key in the 'configs' dict,
   # below). MB uses this dict to look up which config to use for a given bot.
   'masters': {
     # Take care when changing any of these builders to ensure that you do not
@@ skipping 203 matching lines @@
         'swarming_gn_clang_tot_minimal_symbols_shared_debug_use_lld_x86',
       'CrWinClngLLDdbg tester': 'none',
       'EarlGreyiOS': 'ios_gyp',
       'Headless Linux (dbg)':
         '//build/args/bots/chromium.fyi/headless_linux_dbg.gn',
       'MD Top Chrome ChromeOS material-hybrid':
         'gn_chromeos_with_codecs_debug_bot',
       'MD Top Chrome ChromeOS non-material':
         'gn_chromeos_with_codecs_debug_bot',
       'MD Top Chrome Win material':
-        'gyp_debug_bot_minimal_symbols_x64',
+        'gn_debug_bot_minimal_symbols_x64',
       'MD Top Chrome Linux material': 'gn_debug_bot',
       'LTO Linux': 'gn_official_goma_lto',
       'LTO Linux Perf': 'gn_official_goma_lto',
       'Libfuzzer Upload Linux ASan': 'gn_release_libfuzzer_asan',
       'Libfuzzer Upload Linux ASan Debug': 'gn_debug_libfuzzer_asan',
       'Libfuzzer Upload Linux MSan': 'gn_release_libfuzzer_msan',
       'Libfuzzer Upload Linux UBSan': 'gn_release_libfuzzer_ubsan',
       'Libfuzzer Upload Mac ASan': 'gn_release_libfuzzer_asan',
       'Linux ARM': 'swarming_gn_release_bot_arm',
       'Linux deterministic': 'gn_release_bot',
       'Linux remote_run Builder': 'swarming_gn_release_bot',
       'Linux remote_run Tester': 'swarming_gn_release_bot',
       'Linux V8 API Stability': 'gn_release_bot',
       'Mac deterministic': 'gn_release_bot_mac_strip',
       'Mojo ChromiumOS': 'swarming_chromeos_gn_release_bot',
       'Mojo Windows': 'gn_release_bot_minimal_symbols_x86',
       'Site Isolation Linux': 'gn_release_trybot',
-      'Site Isolation Win': 'gyp_release_trybot_x86',
+      'Site Isolation Win': 'gn_release_trybot_x86',
       'UBSanVptr Linux': 'gn_ubsan_vptr_release_bot',
       'WebKit Linux - TraceWrappables': 'swarming_gn_release_bot_x64',
       'WebKit Linux - WPTServe': 'swarming_gn_release_bot',
       'WebKit Mac - WPTServe': 'swarming_gn_release_bot',
       'WebKit Win - WPTServe': 'swarming_gn_release_bot_minimal_symbols_x86',
       'Win 10 Fast Ring': 'gn_release_trybot_x64',
       'Win LKGR (DrM 64)': 'gn_release_drmemory_drfuzz',
       'Win LKGR (DrM)': 'gn_release_drmemory_drfuzz_x86',
       'Windows deterministic': 'gn_release_bot_minimal_symbols_x86',
     },
@@ skipping 664 matching lines @@
       'win_chromium_variable_webkit_win7_builder': 'findit',
       'win_chromium_variable_webkit_win7_builder_x64': 'findit',
       'win_chromium_x64_rel_ng': 'swarming_gn_release_trybot_x64',
       'win_clang': 'win_clang_debug_bot',
       'win_clang_dbg': 'swarming_gn_clang_debug_trybot_x86',
       'win_clang_rel':
         'swarming_gn_clang_official_optimize_release_trybot_x86',
       'win_clang_x64_dbg': 'win_clang_debug_bot',
       'win_clang_x64_rel':
         'swarming_gn_clang_official_optimize_release_trybot_x64',
-      'win_nacl_sdk': 'gyp_release_bot_minimal_symbols_x86',
-      'win_nacl_sdk_build': 'gyp_release_bot_minimal_symbols_x86',
+      'win_nacl_sdk': 'gn_release_bot_minimal_symbols_x86',
+      'win_nacl_sdk_build': 'gn_release_bot_minimal_symbols_x86',
       'win_optional_gpu_tests_rel':
         'swarming_gpu_tests_deqp_gles_gn_release_trybot_x86',
       'win_pgo': [
         'gyp_official_optimize_chrome_pgo_phase_1_x86',
         'gyp_official_optimize_chrome_pgo_phase_2_x86',
       ],
       'win_upload_clang': 'gn_release_bot',
       'win_chrome_official': 'gn_official_goma_minimal_symbols_x86',
       'win_x64_chromium_variable_builder': 'findit',
     },
@@ skipping 385 matching lines @@
 
     'gn_chromeos_asan_lsan_edge_fuzzer_v8_heap_release_bot': [
       'gn', 'chromeos', 'asan', 'lsan', 'edge', 'fuzzer', 'v8_heap',
       'release_bot',
     ],
 
     'gn_chromeos_with_codecs_debug_bot': [
       'gn', 'chromeos_with_codecs', 'debug_bot',
     ],
 
-    'gyp_debug_bot_minimal_symbols_x64': [
-      'gyp', 'debug_bot_minimal_symbols', 'x64',
+    'gn_debug_bot_minimal_symbols_x64': [
+      'gn', 'debug_bot_minimal_symbols', 'x64',
     ],
 
     'gn_debug_bot_minimal_symbols_x86': [
       'gn', 'debug_bot_minimal_symbols', 'x86',
     ],
 
     'gn_drmemory_shared_release_x86': [
       'gn', 'drmemory', 'shared', 'release', 'x86',
     ],
 
@@ skipping 58 matching lines @@
     ],
 
     'gyp_official_x64': [
       'gyp', 'official', 'x64',
     ],
 
     'gyp_official_x64_six_concurrent_links': [
       'gyp', 'official', 'x64', 'six_concurrent_links',
     ],
 
-    'gyp_release_bot_minimal_symbols_x86': [
-      'gyp', 'release_bot_minimal_symbols', 'x86'
-    ],
-
-    'gyp_release_trybot_x86': [
-      'gyp', 'release_trybot', 'x86',
+    'gn_release_trybot_x86': [
+      'gn', 'release_trybot', 'x86',
     ],
 
     'gn_shared_release_bot_minimal_symbols_x86': [
       'gn', 'shared_release_bot', 'minimal_symbols', 'x86',
     ],
 
     'gyp_syzyasan_no_pch_win_z7_x86': [
       'gyp', 'syzyasan', 'no_pch', 'win_z7', 'x86',
     ],
 
@@ skipping 947 matching lines @@
     },
 
     'drfuzz': { 'gn_args': 'use_drfuzz=true' },
 
     'drmemory': {
       'gn_args': 'is_component_build=true enable_iterator_debugging=false',
       'gyp_defines': 'component=shared_library build_for_tool=drmemory',
     },
   },
 }