Revert of Move about half of the clang/win bots 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 96 matching lines @@
       'Chromium Mac 10.9 Goma Canary (dbg)': 'gyp_debug_bot',
       'Chromium Mac 10.9 Goma Canary (dbg)(clobber)': 'gyp_debug_bot',
       'Chromium Win PGO Builder': 'gyp_official_winpgo',
       'Chromium Win x64 PGO Builder': 'gyp_official_winpgo_x64',
       'Chromium Windows Analyze': 'gn_windows_analyze',
       'CrWin7Goma': 'gyp_release_bot_minimal_symbols_x86',
       'CrWin7Goma(clbr)': 'gyp_shared_release_bot_minimal_symbols_x86',
       'CrWin7Goma(dbg)': 'gyp_debug_bot_minimal_symbols_x86',
       'CrWin7Goma(dll)': 'gyp_shared_release_bot_minimal_symbols_x86',
       'CrWinClang':
-        'swarming_gn_clang_official_release_bot_minimal_symbols_x86',
+        'swarming_gyp_clang_official_release_bot_minimal_symbols_x86',
       'CrWinClang(dbg)':
         'swarming_gyp_clang_debug_bot_minimal_symbols_x86',
       'CrWinClang(dbg) tester': 'none',
       'CrWinClang64':
         'swarming_gyp_clang_official_release_bot_minimal_symbols_x64',
       'CrWinClang tester': 'none',
       'CrWinClang64(dll)':
         'swarming_gyp_clang_minimal_symbols_shared_release_bot_x64',
       'CrWinClangGoma': 'gyp_clang_minimal_symbols_shared_release_bot_x86',
       'CrWinGoma': 'gyp_release_bot_minimal_symbols_x86',
@@ skipping 13 matching lines @@
       'ClangToTMac tester': 'none',
       'ClangToTMac (dbg)':
         'swarming_gyp_clang_tot_minimal_symbols_shared_debug',
       'ClangToTMacASan':
         'swarming_gyp_asan_clang_tot_full_symbols_static_release',
       'ClangToTMacASan tester': 'none',
       'ClangToTWin':
         'swarming_gyp_clang_tot_official_minimal_symbols_static_release_x86',
       'ClangToTWin tester': 'none',
       'ClangToTWin(dbg)':
-        'swarming_gn_clang_tot_minimal_symbols_shared_debug_x86',
+        'swarming_gyp_clang_tot_minimal_symbols_shared_debug_x86',
       'ClangToTWin(dbg) tester': 'none',
       'ClangToTWin(dll)':
         'swarming_gyp_clang_tot_minimal_symbols_shared_release_x86',
       'ClangToTWin(dll) tester': 'none',
       'ClangToTWin64':
-        'swarming_gn_clang_tot_official_minimal_symbols_static_release_x64',
+        'swarming_gyp_clang_tot_official_minimal_symbols_static_release_x64',
       'ClangToTWin64 tester': 'none',
       'ClangToTWin64(dbg)':
         'swarming_gyp_clang_tot_minimal_symbols_shared_debug_x64',
       'ClangToTWin64(dbg) tester': 'none',
       'ClangToTWin64(dll)':
-        'swarming_gn_clang_tot_minimal_symbols_shared_release_x64',
+        'swarming_gyp_clang_tot_minimal_symbols_shared_release_x64',
       'ClangToTWin64(dll) tester': 'none',
       'ClangToTiOS': 'ios_gyp',
       'Closure Compilation Linux': 'closure_compilation',
       'CrWinAsan':
        'swarming_gyp_asan_clang_fuzzer_static_v8_heap_x86_full_symbols_release',
       'CrWinAsan tester': 'none',
       'CrWinAsan(dll)':
        'swarming_gyp_asan_clang_fuzzer_shared_v8_heap_x86_full_symbols_release',
       'CrWinAsan(dll) tester': 'none',
       'CrWinAsanCov':
         ('swarming_gyp_asan_clang_edge_fuzzer'
           '_static_v8_heap_x86_full_symbols_release'),
       'CrWinAsanCov tester': 'none',
       'CrWinClang(shared)':
-        'swarming_gn_clang_shared_release_bot_minimal_symbols_x86',
+        'swarming_gyp_clang_shared_release_bot_minimal_symbols_x86',
       'CrWinClang(shared) tester': 'none',
       'CrWinClang64 tester': 'none',
       'CrWinClang64(dbg)': 'win_clang_debug_bot',
       'CrWinClang64(dbg) tester': 'none',
       'CrWinClang64(dll) tester': 'none',
       'CrWinClangLLD':
         'swarming_gyp_clang_tot_minimal_symbols_shared_release_use_lld_x86',
       'CrWinClangLLD tester': 'none',
       'CrWinClangLLD64':
         'swarming_gyp_clang_tot_minimal_symbols_shared_release_use_lld_x64',
@@ skipping 1482 matching lines @@
     'swarming_gyp_clang_minimal_symbols_shared_release_bot_x64': [
       'swarming', 'gyp', 'clang', 'minimal_symbols', 'shared_release_bot',
       'x64',
     ],
 
     'swarming_gyp_clang_official_release_bot_minimal_symbols_x64': [
       'swarming', 'gyp', 'clang', 'official', 'release_bot',
       'minimal_symbols', 'x64',
     ],
 
-    'swarming_gn_clang_official_release_bot_minimal_symbols_x86': [
-      'swarming', 'gn', 'clang', 'official', 'release_bot',
+    'swarming_gyp_clang_official_release_bot_minimal_symbols_x86': [
+      'swarming', 'gyp', 'clang', 'official', 'release_bot',
       'minimal_symbols', 'x86',
     ],
 
     'swarming_gyp_clang_official_release_trybot_x64': [
       'swarming', 'gyp', 'clang', 'official', 'release_trybot', 'x64',
     ],
 
     'swarming_gyp_clang_official_release_trybot_x86': [
       'swarming', 'gyp', 'clang', 'official', 'release_trybot', 'x86',
     ],
 
-    'swarming_gn_clang_shared_release_bot_minimal_symbols_x86': [
-      'swarming', 'gn', 'clang', 'shared_release_bot', 'minimal_symbols',
+    'swarming_gyp_clang_shared_release_bot_minimal_symbols_x86': [
+      'swarming', 'gyp', 'clang', 'shared_release_bot', 'minimal_symbols',
       'x86',
     ],
 
     'swarming_gyp_clang_tot_asan_lsan_static_release': [
       'swarming', 'gyp', 'clang_tot', 'asan', 'lsan', 'static', 'release',
     ],
 
     'swarming_gyp_clang_tot_edge_ubsan_no_recover_hack_static_release': [
       'swarming', 'gyp', 'clang_tot', 'edge', 'ubsan_no_recover_hack',
       'static', 'release',
@@ skipping 18 matching lines @@
     'swarming_gyp_clang_tot_minimal_symbols_shared_debug_use_lld_x86': [
       'swarming', 'gyp', 'clang_tot', 'minimal_symbols', 'shared', 'debug',
       'use_lld', 'x86',
     ],
 
     'swarming_gyp_clang_tot_minimal_symbols_shared_debug_x64': [
       'swarming', 'gyp', 'clang_tot', 'minimal_symbols', 'shared', 'debug',
       'x64',
     ],
 
-    'swarming_gn_clang_tot_minimal_symbols_shared_debug_x86': [
-      'swarming', 'gn', 'clang_tot', 'minimal_symbols', 'shared', 'debug',
+    'swarming_gyp_clang_tot_minimal_symbols_shared_debug_x86': [
+      'swarming', 'gyp', 'clang_tot', 'minimal_symbols', 'shared', 'debug',
       'x86',
     ],
 
     'swarming_gyp_clang_tot_minimal_symbols_shared_release_use_lld_x64': [
       'swarming', 'gyp', 'clang_tot', 'minimal_symbols', 'shared', 'release',
       'use_lld', 'x64',
     ],
 
     'swarming_gyp_clang_tot_minimal_symbols_shared_release_use_lld_x86': [
       'swarming', 'gyp', 'clang_tot', 'minimal_symbols', 'shared', 'release',
       'use_lld', 'x86',
     ],
 
     'swarming_gyp_clang_tot_minimal_symbols_shared_release': [
       'swarming', 'gyp', 'clang_tot', 'minimal_symbols', 'shared', 'release',
     ],
 
-    'swarming_gn_clang_tot_minimal_symbols_shared_release_x64': [
-      'swarming', 'gn', 'clang_tot', 'minimal_symbols', 'shared', 'release',
+    'swarming_gyp_clang_tot_minimal_symbols_shared_release_x64': [
+      'swarming', 'gyp', 'clang_tot', 'minimal_symbols', 'shared', 'release',
       'x64',
     ],
 
     'swarming_gyp_clang_tot_minimal_symbols_shared_release_x86': [
       'swarming', 'gyp', 'clang_tot', 'minimal_symbols', 'shared', 'release',
       'x86',
     ],
 
-    'swarming_gn_clang_tot_official_minimal_symbols_static_release_x64': [
-      'swarming', 'gn', 'clang_tot', 'official', 'minimal_symbols', 'static',
+    'swarming_gyp_clang_tot_official_minimal_symbols_static_release_x64': [
+      'swarming', 'gyp', 'clang_tot', 'official', 'minimal_symbols', 'static',
       'release', 'x64',
     ],
 
     'swarming_gyp_clang_tot_official_minimal_symbols_static_release_x86': [
       'swarming', 'gyp', 'clang_tot', 'official', 'minimal_symbols', 'static',
       'release', 'x86',
     ],
 
     'swarming_gyp_debug_bot': [
       'swarming', 'gyp', 'debug_bot',
@@ skipping 506 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',
     },
   },
 }