Reland of Try yet again to flip official win 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 522 matching lines @@
       'Win 7 x64 Perf (1)': 'none',
       'Win 7 x64 Perf (2)': 'none',
       'Win 7 x64 Perf (3)': 'none',
       'Win 7 x64 Perf (4)': 'none',
       'Win 7 x64 Perf (5)': 'none',
       'Win 8 Perf (1)': 'none',
       'Win 8 Perf (2)': 'none',
       'Win 8 Perf (3)': 'none',
       'Win 8 Perf (4)': 'none',
       'Win 8 Perf (5)': 'none',
-      'Win Builder': 'gyp_official_goma_minimal_symbols_x86',
+      'Win Builder': 'gn_official_goma_minimal_symbols_x86',
       'Win Zenbook Perf (1)': 'none',
       'Win Zenbook Perf (2)': 'none',
       'Win Zenbook Perf (3)': 'none',
       'Win Zenbook Perf (4)': 'none',
       'Win Zenbook Perf (5)': 'none',
       'Win x64 Builder': 'gn_official_goma_minimal_symbols_x64',
     },
 
     'client.v8.fyi': {
       'Android Builder': 'gn_official_goma_minimal_symbols_android',
@@ skipping 90 matching lines @@
       'Windows Dev': 'swarming_gn_debug_bot_minimal_symbols_x64',
     },
 
     'official.desktop': {
       'blimp-engine': '//build/args/bots/official.desktop/blimp-engine.gn',
       'mac64': 'gn_official',
       'precise64': 'gn_official',
 
       # Currently the official bots set mini_installer_official_deps=1
       # but it's not clear if that's actually used anywhere.
-      'win': 'gyp_official',
+      'win': 'gn_official_x86',
       'win-asan': 'gn_official_syzyasan_x86',
       'win-pgo': [
         'gn_official_chrome_pgo_phase_1_x86',
         'gn_official_chrome_pgo_phase_2_x86',
       ],
-      'win64': 'gyp_official_x64',
+      'win64': 'gn_official_x64',
       'win64-pgo': [
         'gn_official_chrome_pgo_phase_1_x64',
         'gn_official_chrome_pgo_phase_2_x64',
       ],
     },
 
     'official.desktop.continuous': {
       'mac beta': 'gyp_official',
       'mac stable': 'gyp_official',
       'mac trunk': 'gn_official',
       'precise64 beta': 'gn_official',
       'precise64 stable': 'gn_official',
       'precise64 trunk': 'gn_official',
-      'win beta': 'gyp_official_six_concurrent_links',
-      'win stable': 'gyp_official_six_concurrent_links',
-      'win trunk': 'gyp_official_six_concurrent_links',
-      'win64 trunk': 'gyp_official_x64_six_concurrent_links',
+      'win beta': 'gn_official_six_concurrent_links',
+      'win stable': 'gn_official_six_concurrent_links',
+      'win trunk': 'gn_official_six_concurrent_links',
+      'win64 trunk': 'gn_official_x64_six_concurrent_links',
     },
 
     'tryserver.blink': {
       # Most tryservers should have '_trybot' in their config names, but
       # 'release_trybot' includes 'dcheck_always_on', and the blink
       # release trybots must *not* enable dchecks, because that could
       # cause them to produce different baselines than the release
       # waterfall bots, and run-webkit-tests can't handle that (by design).
       'linux_precise_blink_compile_dbg': 'swarming_gn_debug_trybot',
       'linux_precise_blink_compile_rel':
@@ skipping 486 matching lines @@
     ],
 
     'gn_linux_upload': [
       'gn_linux_upload', 'official', 'goma',
     ],
 
     'gn_official': [
       'gn', 'official',
     ],
 
+    'gn_official_x86': [
+      'gn', 'official', 'x86',
+    ],
+
     'gn_official_goma': [
       'gn', 'official', 'goma',
     ],
 
     'gn_official_goma_lto': [
       'gn', 'official', 'goma', 'lto',
     ],
 
     'gn_official_goma_minimal_symbols_android': [
       'gn', 'official', 'goma', 'minimal_symbols', 'android',
     ],
 
     'gn_official_goma_minimal_symbols_android_arm64': [
       'gn', 'official', 'goma', 'minimal_symbols', 'android', 'arm64',
     ],
 
     'gn_official_goma_minimal_symbols_x64': [
       'gn', 'official', 'goma', 'minimal_symbols', 'x64',
     ],
 
     'gn_official_goma_minimal_symbols_x86': [
       'gn', 'official', 'goma', 'minimal_symbols', 'x86',
     ],
 
-    'gyp_official_goma_minimal_symbols_x86': [
-      'gyp', 'official', 'goma', 'minimal_symbols', 'x86',
+    'gn_official_goma_minimal_symbols_x86': [
+      'gn', 'official', 'goma', 'minimal_symbols', 'x86',
     ],
 
     'gn_release_bot': [
       'gn', 'release_bot',
     ],
 
     'gn_release_bot_chrome_with_codecs': [
       'gn', 'release_bot', 'chrome_with_codecs',
     ],
 
@@ skipping 148 matching lines @@
     ],
 
     'gn_official_goma_chromeos': [
       'gn', 'official', 'goma', 'chromeos',
     ],
 
     'gn_official_syzyasan_x86': [
       'gn', 'official', 'syzyasan', 'x86',
     ],
 
-    'gyp_official_six_concurrent_links': [
-      'gyp', 'official', 'six_concurrent_links',
+    'gn_official_six_concurrent_links': [
+      'gn', 'official', 'six_concurrent_links',
     ],
 
     'gn_official_chrome_pgo_phase_1_x64': [
       'gn', 'official', 'chrome_pgo_phase_1', 'x64',
     ],
 
     'gn_official_chrome_pgo_phase_2_x64': [
       'gn', 'official', 'chrome_pgo_phase_2', 'x64',
     ],
 
@@ skipping 14 matching lines @@
     ],
 
     'gn_official_optimize_chrome_pgo_phase_1_x86': [
       'gn', 'official_optimize', 'chrome_pgo_phase_1', 'x86',
     ],
 
     'gn_official_optimize_chrome_pgo_phase_2_x86': [
       'gn', 'official_optimize', 'chrome_pgo_phase_2', 'x86',
     ],
 
-    'gyp_official_x64': [
-      'gyp', 'official', 'x64',
+    'gn_official_x64': [
+      'gn', 'official', 'x64',
     ],
 
-    'gyp_official_x64_six_concurrent_links': [
-      'gyp', 'official', 'x64', 'six_concurrent_links',
+    'gn_official_x64_six_concurrent_links': [
+      'gn', 'official', 'x64', 'six_concurrent_links',
     ],
 
     'gn_release_trybot_x86': [
       'gn', 'release_trybot', 'x86',
     ],
 
     'gn_shared_release_bot_minimal_symbols_x86': [
       'gn', 'shared_release_bot', 'minimal_symbols', 'x86',
     ],
 
@@ skipping 943 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',
     },
   },
 }