Revert of Change FYI win clang builders from official to official_optimize.

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 114 matching lines @@
         'gn_official_optimize_chrome_pgo_phase_1_x64',
         'gn_official_optimize_chrome_pgo_phase_2_x64',
       ],
       'Chromium Windows Analyze': 'gn_windows_analyze',
       'CrWin7Goma': 'gn_release_bot_minimal_symbols_x86',
       'CrWin7Goma(clbr)': 'gn_shared_release_bot_minimal_symbols_x86',
       'CrWin7Goma(dbg)': 'gn_debug_bot_minimal_symbols_x86',
       'CrWin7Goma(dll)': 'gn_shared_release_bot_minimal_symbols_x86',
       # if CrWinClang is modified, please update CrWinClangGoma in the same way.
       'CrWinClang':
-        'swarming_gn_clang_official_optimize_release_bot_minimal_symbols_x86',
+        'swarming_gn_clang_official_release_bot_minimal_symbols_x86',
       'CrWinClang(dbg)':
         'swarming_gn_clang_debug_bot_minimal_symbols_x86',
       'CrWinClang(dbg) tester': 'none',
       'CrWinClang64':
-        'swarming_gn_clang_official_optimize_release_bot_minimal_symbols_x64',
+        'swarming_gn_clang_official_release_bot_minimal_symbols_x64',
       'CrWinClang tester': 'none',
       'CrWinClang64(dll)':
         'swarming_gn_clang_minimal_symbols_shared_release_bot_x64',
       'CrWinClangGoma':
         'swarming_gn_clang_official_optimize_release_bot_minimal_symbols_x86',
       'CrWinGoma': 'gn_release_bot_minimal_symbols_x86',
       'CrWinGoma(dll)': 'gn_shared_release_bot_minimal_symbols_x86',
       'ClangToTAndroidASan': 'android_clang_tot_asan',
       'ClangToTAndroidASan tester': 'none',
       'ClangToTLinux':
@@ skipping 822 matching lines @@
       'win_chromium_variable_chrome': 'findit',
       'win_chromium_variable_clang': 'findit',
       'win_chromium_variable_gn': 'findit',
       'win_chromium_variable_webkit_builder': 'findit',
       'win_chromium_variable_webkit_layout': 'findit',
       '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_rel': 'swarming_gn_clang_official_release_trybot_x86',
       'win_clang_x64_dbg': 'win_clang_debug_bot',
-      'win_clang_x64_rel':
-        'swarming_gn_clang_official_optimize_release_trybot_x64',
+      'win_clang_x64_rel': 'swarming_gn_clang_official_release_trybot_x64',
       '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': [
         'gn_official_optimize_chrome_pgo_phase_1_x86',
         'gn_official_optimize_chrome_pgo_phase_2_x86',
       ],
       'win_upload_clang': 'gn_release_bot',
       'win_chrome_official': 'gn_official_goma_minimal_symbols_x86',
@@ skipping 833 matching lines @@
 
     'swarming_gn_clang_debug_trybot_x86': [
       'swarming', 'gn', 'clang', 'debug_trybot', 'x86',
     ],
 
     'swarming_gn_clang_minimal_symbols_shared_release_bot_x64': [
       'swarming', 'gn', 'clang', 'minimal_symbols', 'shared_release_bot',
       'x64',
     ],
 
-    'swarming_gn_clang_official_optimize_release_bot_minimal_symbols_x64': [
-      'swarming', 'gn', 'clang', 'official_optimize', 'release_bot',
+    'swarming_gn_clang_official_release_bot_minimal_symbols_x64': [
+      'swarming', 'gn', 'clang', 'official', 'release_bot',
       'minimal_symbols', 'x64',
     ],
 
+    'swarming_gn_clang_official_release_bot_minimal_symbols_x86': [
+      'swarming', 'gn', 'clang', 'official', 'release_bot',
+      'minimal_symbols', 'x86',
+    ],
+
     'swarming_gn_clang_official_optimize_release_bot_minimal_symbols_x86': [
       'swarming', 'gn', 'clang', 'official_optimize', 'release_bot',
       'minimal_symbols', 'x86',
     ],
 
-    'swarming_gn_clang_official_optimize_release_trybot_x64': [
-      'swarming', 'gn', 'clang', 'official_optimize', 'release_trybot', 'x64',
+    'swarming_gn_clang_official_release_trybot_x64': [
+      'swarming', 'gn', 'clang', 'official', 'release_trybot', 'x64',
     ],
 
-    'swarming_gn_clang_official_optimize_release_trybot_x86': [
-      'swarming', 'gn', 'clang', 'official_optimize', 'release_trybot', 'x86',
+    'swarming_gn_clang_official_release_trybot_x86': [
+      'swarming', 'gn', 'clang', 'official', 'release_trybot', 'x86',
     ],
 
     'swarming_gn_clang_shared_release_bot_minimal_symbols_x86': [
       'swarming', 'gn', 'clang', 'shared_release_bot', 'minimal_symbols',
       'x86',
     ],
 
     'swarming_gn_clang_tot_asan_lsan_static_release': [
       'swarming', 'gn', 'clang_tot', 'asan', 'lsan', 'static', 'release',
     ],
@@ skipping 553 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',
     },
   },
 }