Revert of Try again to flip Win x86, x64 official 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 603 matching lines @@
       'WinClang64 (dbg)': 'win_clang_debug_bot',
     },
 
     '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': 'gn_official_x86',
+      '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',
     },
 
     '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': 'gn_official_six_concurrent_links_x86',
-      'win64 trunk': 'gn_official_six_concurrent_links_x64',
+      'win trunk': 'gyp_official_six_concurrent_links',
+      'win64 trunk': 'gyp_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_blink_compile_dbg': 'swarming_gn_debug_trybot',
       'linux_blink_compile_rel': 'swarming_gn_release_bot_minimal_symbols',
@@ skipping 498 matching lines @@
     ],
 
     '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_six_concurrent_links_x86': [
-      'gn', 'official', 'six_concurrent_links', 'x86',
-    ],
-
-    'gn_official_six_concurrent_links_x64': [
-      'gn', 'official', 'six_concurrent_links', 'x64',
-    ],
-
-    'gn_official_x64': [
-      'gn', 'official', 'x64',
-    ],
-
-    'gn_official_x86': [
-      'gn', 'official', 'x86',
-    ],
-
     'gn_release_bot': [
       'gn', 'release_bot',
     ],
 
     'gn_release_bot_chrome_with_codecs': [
       'gn', 'release_bot', 'chrome_with_codecs',
     ],
 
     'gn_release_bot_minimal_symbols_chrome_with_codecs': [
       'gn', 'release_bot_minimal_symbols', 'chrome_with_codecs',
@@ skipping 174 matching lines @@
     # TODO(crbug.com/595947) - figure out how to handle PGO, which needs
     # to invoke GYP/GN twice, with two different sets of flags, apparently.
     'gyp_official_winpgo': [
       'gyp', 'error',
     ],
 
     'gyp_official_winpgo_x64': [
       'gyp', 'error', 'x64',
     ],
 
+    'gyp_official_x64': [
+      'gyp', 'official', 'x64',
+    ],
+
+    'gyp_official_x64_six_concurrent_links': [
+      'gyp', 'official', 'x64', 'six_concurrent_links',
+    ],
+
     'gyp_release_bot': [
       'gyp', 'release_bot',
     ],
 
     'gyp_release_bot_minimal_symbols_x86': [
       'gyp', 'release_bot_minimal_symbols', 'x86'
     ],
 
     'gyp_release_trybot_x86': [
       'gyp', 'release_trybot', 'x86',
@@ skipping 940 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',
     },
   },
 }