Revert "Speculative revert by sheriff"

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 the list of configs that you can pass to mb; each config
   # represents a particular combination of GYP_DEFINES/gn args that
   # we must support. A given config *may* be platform-specific but
   # is not necessarily so (i.e., we might have mac, win, and linux
   # bots all using the 'gn_release_bot' config).
   'configs': {
     'android_gn_release_bot': ['android', 'gn', 'release_bot'],
     'android_gn_debug_bot': ['android', 'gn', 'debug_static_bot'],
     'android_gn_release_trybot': ['android', 'gn', 'release_trybot'],
     'chromeos_gn_debug_bot': ['chromeos', 'gn', 'debug_bot'],
     'chromeos_gn_release_bot': ['chromeos', 'gn', 'release_bot'],
     'chromeos_gn_release_trybot': ['chromeos', 'gn', 'release_trybot'],
     'dev_gn_debug': ['gn', 'debug', 'shared', 'full_symbols'],
     'dev_gyp_debug': ['gyp', 'debug', 'shared', 'full_symbols'],
     'dev_gn_release': ['gn', 'release', 'shared'],
     'dev_gyp_release': ['gyp', 'release', 'shared'],
     'gn_release_bot': ['gn', 'release_bot'],
     'gn_release_bot_x86': ['gn', 'release_bot', 'x86'],
     'gn_release_trybot': ['gn', 'release_trybot'],
+    'gn_release_trybot_x86': ['gn', 'release_trybot', 'x86'],
     'gn_debug_bot': ['gn', 'debug_bot'],
-    'gn_debug_bot_win_x86': ['gn', 'debug_static_bot', 'x86'],
+    'gn_debug_static_bot': ['gn', 'debug_static_bot'],
+    'gn_debug_static_bot_x86': ['gn', 'debug_static_bot', 'x86'],
     'gyp_release_bot': ['gyp', 'release_bot'],
   },
   
   # This is a list of configs that do not actually exist on any bot
   # but are used so commonly by devs that we must support them.
   'common_dev_configs': [
     'dev_gn_debug',
     'dev_gn_release',
     'dev_gyp_debug',
     'dev_gyp_release',
@@ skipping 101 matching lines @@
     },
     'chromium.linux': {
       'Android GN': 'android_gn_release_bot',
       'Linux Builder': 'gyp_release_bot',
       'Linux GN': 'gn_release_bot',
       'Linux GN (dbg)': 'gn_debug_bot',
       'Linux Tests': 'gyp_release_bot',
     },
     'chromium.mac': {
       'Mac GN': 'gn_release_bot',
-      'Mac GN (dbg)': 'gn_debug_bot',
+      'Mac GN (dbg)': 'gn_debug_static_bot',
     },
     'chromium.win': {
       'Win8 GN': 'gn_release_bot_x86',
-      'Win8 GN (dbg)': 'gn_debug_bot_win_x86',
+      'Win8 GN (dbg)': 'gn_debug_static_bot_x86',
     },
     'chromium.webkit': {
       'Android GN': 'gn_release_bot',
       'Android GN (dbg)': 'gn_debug_bot',
       'Linux GN': 'gn_release_bot',
       'Linux GN (dbg)': 'gn_debug_bot'
     },
     'tryserver.blink': {
       'android_chromium_gn_compile_rel': 'android_gn_release_bot',
       'linux_chromium_gn_rel': 'gn_release_bot',
     },
     'tryserver.chromium.linux': {
       'android_chromium_gn_compile_dbg': 'android_gn_debug_bot',
       'android_chromium_gn_compile_rel': 'android_gn_release_trybot',
       'linux_chromium_gn_chromeos_rel': 'chromeos_gn_release_trybot',
       'linux_chromium_gn_chromeos_dbg': 'chromeos_gn_debug_bot',
       'linux_chromium_gn_dbg': 'gn_debug_bot', 
       'linux_chromium_gn_rel': 'gn_release_trybot', 
       'linux_chromium_gn_upload_x64': 'gn_release_bot',
       'linux_chromium_gn_upload_x86': 'gn_release_bot_x86',
     },
     'tryserver.chromium.mac': {
-      'mac_chromium_gn_dbg': 'gn_debug_bot',
+      'mac_chromium_gn_dbg': 'gn_debug_static_bot',
       'mac_chromium_gn_rel': 'gn_release_trybot',
       'mac_chromium_gn_upload': 'gn_release_bot',
     },
     'tryserver.chromium.win': {
-      'win8_chromium_gn_dbg': 'gn_debug_bot',
-      'win8_chromium_gn_rel': 'gn_release_trybot',
+      'win8_chromium_gn_dbg': 'gn_debug_static_bot_x86',
+      'win8_chromium_gn_rel': 'gn_release_trybot_x86',
       'win8_chromium_gn_upload': 'gn_release_bot',
     },
   },
 }