Fix MB configs for public PGO builders.

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 99 matching lines @@
       'Chromium Linux Precise Goma LinkTest': 'gn_release_bot',
       'Chromium Linux32 Goma Canary (clobber)': 'gn_release_bot_x86',
       'Chromium Mac 10.10 MacViews': 'mac_views_browser_gn_release_bot',
       'Chromium Mac 10.11': 'gn_release_bot',
       'Chromium Mac 10.11 Force Mac Toolchain': 'gn_release_bot',
       'Chromium Mac 10.9 Goma Canary': 'gn_release_bot',
       'Chromium Mac 10.9 Goma Canary (clobber)': 'gn_release_bot',
       'Chromium Mac 10.9 Goma Canary (dbg)': 'gn_debug_bot',
       'Chromium Mac 10.9 Goma Canary (dbg)(clobber)': 'gn_debug_bot',
       'Chromium Win PGO Builder': [
-        'gyp_official_chrome_pgo_phase_1_x86',
-        'gyp_official_chrome_pgo_phase_2_x86'
+        'gyp_official_optimize_chrome_pgo_phase_1_x86',
+        'gyp_official_optimize_chrome_pgo_phase_2_x86'
       ],
       'Chromium Win x64 PGO Builder': [
-        'gyp_official_chrome_pgo_phase_1_x64',
-        'gyp_official_chrome_pgo_phase_2_x64',
+        'gyp_official_optimize_chrome_pgo_phase_1_x64',
+        'gyp_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',
       'CrWinClang':
         'swarming_gn_clang_official_release_bot_minimal_symbols_x86',
       'CrWinClang(dbg)':
         'swarming_gyp_clang_debug_bot_minimal_symbols_x86',
@@ skipping 779 matching lines @@
       'win_clang': 'win_clang_debug_bot',
       'win_clang_dbg': 'swarming_gyp_clang_debug_trybot_x86',
       'win_clang_rel': 'swarming_gyp_clang_official_release_trybot_x86',
       'win_clang_x64_dbg': 'win_clang_debug_bot',
       'win_clang_x64_rel': 'swarming_gyp_clang_official_release_trybot_x64',
       'win_nacl_sdk': 'gyp_release_bot_minimal_symbols_x86',
       'win_nacl_sdk_build': 'gyp_release_bot_minimal_symbols_x86',
       'win_optional_gpu_tests_rel':
         'swarming_gpu_tests_deqp_gles_gn_release_trybot_x86',
       'win_pgo': [
-        'gyp_official_chrome_pgo_phase_1_x86',
-        'gyp_official_chrome_pgo_phase_2_x86',
+        'gyp_official_optimize_chrome_pgo_phase_1_x86',
+        'gyp_official_optimize_chrome_pgo_phase_2_x86',
       ],
       'win_upload_clang': 'gn_release_bot',
       'win_chrome_official': 'gn_official_goma_minimal_symbols_x86',
       'win_x64_chromium_variable_builder': 'findit',
     },
 
     'tryserver.v8': {
       'v8_android_chromium_gn_dbg': 'android_gn_debug_bot',
       'v8_linux_blink_rel': 'swarming_gn_release_trybot_x64',
       'v8_linux_chromium_gn_rel': 'gn_release_trybot',
@@ skipping 433 matching lines @@
 
     'gyp_official_chrome_pgo_phase_2_x64': [
       'gyp', 'official', 'chrome_pgo_phase_2', 'x64',
     ],
 
     'gyp_official_chrome_pgo_phase_1_x86': [
       'gyp', 'official', 'chrome_pgo_phase_1', 'x86',
     ],
 
     'gyp_official_chrome_pgo_phase_2_x86': [
-      'gyp', 'official', 'chrome_pgo_phase_2', 'x86',
+      'gyp', 'official_optimize', 'chrome_pgo_phase_2', 'x86',
+    ],
+
+    'gyp_official_optimize_chrome_pgo_phase_1_x64': [
+      'gyp', 'official_optimize', 'chrome_pgo_phase_1', 'x64',
+    ],
+
+    'gyp_official_optimize_chrome_pgo_phase_2_x64': [
+      'gyp', 'official_optimize', 'chrome_pgo_phase_2', 'x64',
+    ],
+
+    'gyp_official_optimize_chrome_pgo_phase_1_x86': [
+      'gyp', 'official_optimize', 'chrome_pgo_phase_1', 'x86',
+    ],
+
+    'gyp_official_optimize_chrome_pgo_phase_2_x86': [
+      'gyp', 'official_optimize', 'chrome_pgo_phase_2', 'x86',
     ],
 
     'gyp_official_x64': [
       'gyp', 'official', 'x64',
     ],
 
     'gyp_official_x64_six_concurrent_links': [
       'gyp', 'official', 'x64', 'six_concurrent_links',
     ],
 
@@ skipping 821 matching lines @@
       'gyp_defines': 'fastbuild=2',
     },
 
     'noswarming': {
       # test_isolation_mode doesn't exist in a GN build (it's always a no-op).
       'gn_args': '',
       'gyp_defines': 'test_isolation_mode=noop',
     },
 
     'official': {
-      'gn_args': ('is_chrome_branded=true is_official_build=true '
-                  'is_debug=false'),
-      'gyp_defines': 'branding=Chrome buildtype=Official',
+      'mixins': ['official_optimize'],
+      'gn_args': 'is_chrome_branded=true',
+      'gyp_defines': 'branding=Chrome',
+    },
+
+    'official_optimize': {
+      'gn_args': 'is_official_build=true is_debug=false',
+      'gyp_defines': 'buildtype=Official',
     },
 
     'ozone': {
       'gn_args': 'use_ozone=true',
       'gyp_defines': 'use_ozone=1',
     },
 
     'pdf_xfa': {
       'gn_args': 'pdf_enable_xfa=true',
       'gyp_defines': 'pdf_enable_xfa=1',
@@ skipping 114 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',
     },
   },
 }