BASELINE: Update Chromium to 68.0.3440.125

Change-Id: I23f19369e01f688e496f5bf179abb521ad73874f
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

4 files changed, 107 insertions, 204 deletions

diff --git a/chromium/tools/mb/docs/user_guide.md b/chromium/tools/mb/docs/user_guide.md
index ba8bff90b1b..fd5823b5ee9 100644
--- a/chromium/tools/mb/docs/user_guide.md
+++ b/chromium/tools/mb/docs/user_guide.md
@@ -186,21 +186,6 @@ Builds and isolates a given (ninja) target like the `isolate` command does,
 and then takes all of the files in the isolate and writes them into a single
 zip file that can then easily be redistributed.
 
-### mb gerrit-buildbucket-config
-
-Generates a gerrit buildbucket configuration file and prints it to
-stdout. This file contains the list of trybots shown in gerrit's UI.
-
-The master copy of the buildbucket.config file lives
-in a separate branch of the chromium repository. Run `mb
-gerrit-buildbucket-config > buildbucket.config.new && git fetch origin
-refs/meta/config:refs/remotes/origin/meta/config && git checkout
--t -b meta_config origin/meta/config && mv buildbucket.config.new
-buildbucket.config` to update the file.
-
-Note that after committing, `git cl upload` will not work. Instead, use `git
-push origin HEAD:refs/for/refs/meta/config` to upload the CL for review.
-
 ## Isolates and Swarming
 
 `mb gen` is also responsible for generating the `.isolate` and
diff --git a/chromium/tools/mb/mb.py b/chromium/tools/mb/mb.py
index 46a66bf5e8b..94bf68ef05a 100755
--- a/chromium/tools/mb/mb.py
+++ b/chromium/tools/mb/mb.py
@@ -54,7 +54,6 @@ class MetaBuildWrapper(object):
     self.sep = os.sep
     self.args = argparse.Namespace()
     self.configs = {}
-    self.luci_tryservers = {}
     self.masters = {}
     self.mixins = {}
 
@@ -222,14 +221,6 @@ class MetaBuildWrapper(object):
                       help='path to config file (default is %(default)s)')
     subp.set_defaults(func=self.CmdValidate)
 
-    subp = subps.add_parser('gerrit-buildbucket-config',
-                            help='Print buildbucket.config for gerrit '
-                            '(see MB user guide)')
-    subp.add_argument('-f', '--config-file', metavar='PATH',
-                      default=self.default_config,
-                      help='path to config file (default is %(default)s)')
-    subp.set_defaults(func=self.CmdBuildbucket)
-
     subp = subps.add_parser('zip',
                             help='generate a .zip containing the files needed '
                                  'for a given binary')
@@ -483,25 +474,6 @@ class MetaBuildWrapper(object):
             ('cpu', 'x86-64'),
             os_dim]
 
-  def CmdBuildbucket(self):
-    self.ReadConfigFile()
-
-    self.Print('# This file was generated using '
-               '"tools/mb/mb.py gerrit-buildbucket-config".')
-
-    for luci_tryserver in sorted(self.luci_tryservers):
-      self.Print('[bucket "luci.%s"]' % luci_tryserver)
-      for bot in sorted(self.luci_tryservers[luci_tryserver]):
-        self.Print('\tbuilder = %s' % bot)
-
-    for master in sorted(self.masters):
-      if master.startswith('tryserver.'):
-        self.Print('[bucket "master.%s"]' % master)
-        for bot in sorted(self.masters[master]):
-          self.Print('\tbuilder = %s' % bot)
-
-    return 0
-
   def CmdValidate(self, print_ok=True):
     errs = []
 
@@ -665,7 +637,6 @@ class MetaBuildWrapper(object):
                  (self.args.config_file, e))
 
     self.configs = contents['configs']
-    self.luci_tryservers = contents.get('luci_tryservers', {})
     self.masters = contents['masters']
     self.mixins = contents['mixins']
 
@@ -992,6 +963,7 @@ class MetaBuildWrapper(object):
     isolate_map = self.ReadIsolateMap()
 
     is_android = 'target_os="android"' in vals['gn_args']
+    is_simplechrome = vals.get('cros_passthrough', False)
     is_fuchsia = 'target_os="fuchsia"' in vals['gn_args']
     is_win = self.platform == 'win32' or 'target_os="win"' in vals['gn_args']
 
@@ -1036,6 +1008,11 @@ class MetaBuildWrapper(object):
           '../../testing/test_env.py',
           os.path.join('bin', 'run_%s' % target),
       ]
+    elif is_simplechrome and test_type != 'script':
+      cmdline = [
+          '../../testing/test_env.py',
+          os.path.join('bin', 'run_%s' % target),
+      ]
     elif use_xvfb and test_type == 'windowed_test_launcher':
       extra_files.append('../../testing/xvfb.py')
       cmdline = [
@@ -1060,7 +1037,13 @@ class MetaBuildWrapper(object):
           '--cfi-diag=%d' % cfi_diag,
       ]
     elif test_type == 'script':
-      cmdline = [
+      cmdline = []
+      # If we're testing a CrOS simplechrome build, assume we need to launch a
+      # VM first. So prepend the command to run with the VM launcher.
+      # TODO(bpastene): Differentiate between CrOS VM and hardware tests.
+      if is_simplechrome:
+        cmdline = [os.path.join('bin', 'launch_cros_vm')]
+      cmdline += [
           '../../testing/test_env.py',
           '../../' + self.ToSrcRelPath(isolate_map[target]['script'])
       ]
diff --git a/chromium/tools/mb/mb_config.pyl b/chromium/tools/mb/mb_config.pyl
index c77bd611ae8..2cab49055a5 100644
--- a/chromium/tools/mb/mb_config.pyl
+++ b/chromium/tools/mb/mb_config.pyl
@@ -45,7 +45,6 @@
       'Android Cronet Marshmallow 64bit Perf': 'android_cronet_release_bot_minimal_symbols_arm64',
       'Android Cronet x86 Builder': 'android_cronet_release_bot_minimal_symbols_x86',
       'Android Cronet x86 Builder (dbg)': 'android_cronet_debug_static_bot_x86',
-      'Android MIPS Builder (dbg)': 'android_debug_static_bot_mipsel',
       'Android N5X Swarm Builder': 'android_release_bot_minimal_symbols_arm64',
       'Android arm Builder (dbg)': 'android_debug_static_bot',
       'Android arm64 Builder (dbg)': 'android_debug_static_bot_arm64',
@@ -56,6 +55,8 @@
       'Deterministic Android (dbg)': 'android_debug_bot',
       'KitKat Phone Tester (rel)': 'android_release_bot_minimal_symbols',
       'Marshmallow Phone Tester (rel)': 'android_release_bot_minimal_symbols_arm64',
+      'android-kitkat-arm-rel': 'android_release_bot_minimal_symbols',
+      'android-marshmallow-arm64-rel': 'android_release_bot_minimal_symbols_arm64',
     },
 
     'chromium.android.fyi': {
@@ -96,7 +97,6 @@
     'chromium.chromiumos': {
       'ChromiumOS amd64-generic Compile': 'cros_chrome_sdk',
       'ChromiumOS daisy Compile': 'cros_chrome_sdk',
-      'Linux ChromiumOS Builder': 'chromeos_with_codecs_release_bot',
       'Linux ChromiumOS Builder (dbg)': 'chromeos_with_codecs_debug_bot',
       'Linux ChromiumOS Full': 'chromeos_with_codecs_release_bot',
 
@@ -114,19 +114,10 @@
       'CrWinAsan(dll)': 'asan_clang_shared_v8_heap_x86_full_symbols_release',
       'CrWinAsanCov': 'asan_clang_edge_fuzzer_static_v8_heap_x86_full_symbols_release',
 
-      # TODO(crbug.com/751220): These are MSVC bots. Rename the buildbots at
-      # some point.
-      'CrWinClang': 'win_msvc_release_bot_x86',
-      'CrWinClang(dbg)': 'win_msvc_debug_bot_x86',
-      'CrWinClang(shared)': 'win_msvc_shared_release_bot_x86',
-      'CrWinClang64': 'win_msvc_release_bot',
-      'CrWinClang64(dbg)': 'win_msvc_debug_bot',
-      'CrWinClang64(dll)': 'win_msvc_shared_release_bot',
-
-      'CrWinClangLLD': 'clang_tot_official_static_use_lld_x86',
-      'CrWinClangLLD64': 'clang_tot_shared_release_use_lld_dcheck',
-      'CrWinClngLLD64dbg': 'clang_tot_full_symbols_shared_debug_use_lld',
-      'CrWinClngLLDdbg': 'clang_tot_full_symbols_shared_debug_use_lld_x86',
+      'CrWinClangLLD': 'clang_tot_official_static_no_lld_x86',
+      'CrWinClangLLD64': 'clang_tot_shared_release_no_lld_dcheck',
+      'CrWinClngLLD64dbg': 'clang_tot_full_symbols_shared_debug_no_lld',
+      'CrWinClngLLDdbg': 'clang_tot_full_symbols_shared_debug_no_lld_x86',
       'linux-win_cross-rel': 'clang_tot_win_release_cross',
       'ToTAndroid': 'android_clang_tot_release_minimal_symbols',
       'ToTAndroid64': 'android_clang_tot_release_arm64',
@@ -136,6 +127,7 @@
       'ToTAndroid64': 'android_clang_tot_release_arm64',
       'ToTAndroid x64': 'android_clang_tot_x64',
       'ToTLinux': 'clang_tot_linux_full_symbols_shared_release',
+      'ToTLinuxCoverage': 'clang_tot_coverage_minimal_symbols_shared_release',
       'ToTLinux (dbg)': 'clang_tot_shared_debug',
       'ToTLinuxASan': 'clang_tot_asan_lsan_static_release',
       'ToTLinuxASanLibfuzzer': 'release_libfuzzer_asan_clang_tot',
@@ -143,6 +135,7 @@
       'ToTLinuxThinLTO': 'clang_tot_release_minimal_symbols_thin_lto_static_use_lld',
       'ToTLinuxUBSanVptr': 'clang_tot_edge_ubsan_no_recover_hack_static_release',
       'ToTMac': 'clang_tot_minimal_symbols_shared_release',
+      'ToTMacCoverage': 'clang_tot_coverage_minimal_symbols_shared_release',
       'ToTMac (dbg)': 'clang_tot_shared_debug',
       'ToTMacASan': 'asan_disable_nacl_clang_tot_full_symbols_static_release',
       'ToTWin': 'clang_tot_official_minimal_symbols_static_release_x86',
@@ -165,13 +158,12 @@
 
       'Android Builder (dbg) Goma Canary': 'android_debug_static_bot_vrdata',
 
-      'Android deterministic': 'android_without_codecs_release_bot_minimal_symbols',
-      'Android deterministic (dbg)': 'android_debug_bot',
       'Browser Side Navigation Linux': 'release_bot',
       'CFI Linux CF': 'cfi_full_cfi_icall_cfi_diag_recover_release_static',
       'CFI Linux ToT': 'clang_tot_cfi_full_cfi_icall_cfi_diag_thin_lto_release_static_dcheck_always_on',
       'CFI Linux (icall)': 'cfi_full_diag_icall_release_static_dcheck_always_on',
       'chromeos-amd64-generic-rel-goma-canary': 'cros_chrome_sdk',
+      'chromeos-amd64-generic-rel-vm-tests': 'cros_chrome_sdk',
 
       'Linux Builder Goma Canary': 'release_bot',
       'Linux x64 Goma Canary (clobber)': 'release_bot',
@@ -234,15 +226,13 @@
       'Linux ARM64': 'release_bot_arm64',
       'Linux ARM64 (dbg)': 'debug_bot_arm64',
       'Linux Clang Analyzer': 'linux_chromium_analysis',
-      'Linux deterministic': 'release_bot',
-      'Linux deterministic (dbg)': 'debug_bot',
       'Linux remote_run Builder': 'release_bot',
       'Linux remote_run Tester': 'release_bot',
       'Linux Viz': 'release_trybot',
-      'Linux Xenial': 'release_bot',
       'linux-annotator-rel': 'release_bot',
       'linux-blink-heap-incremental-marking': 'debug_bot_enable_blink_heap_incremental_marking',
       'linux-blink-heap-verification': 'release_bot_enable_blink_heap_verification_dcheck_always_on',
+      'linux-chromium-tests-staging-builder': 'release_bot',
       'Mac deterministic': 'release_bot_mac_strip',
       'Mac deterministic (dbg)': 'debug_bot',
       'Mojo ChromiumOS': 'chromeos_with_codecs_release_trybot',
@@ -269,9 +259,11 @@
       'CrWinGomaStaging': 'release_bot_x86_minimal_symbols',
       'Chromium Linux Goma GCE Staging': 'release_bot',
       'Chromium Mac Goma GCE Staging': 'release_bot',
-      'CrWinClexeGomaGCEStaging': 'release_bot_x86_minimal_symbols_disable_nacl_no_clang',
       'CrWinClangGomaGCEStaging': 'win_clang_release_bot_disable_nacl',
+      'Chromium Linux Goma RBE Staging (clobber)': 'release_bot',
       'Chromium Linux Goma RBE Staging': 'release_bot',
+      'Chromium Linux Goma RBE Staging (dbg) (clobber)': 'debug_bot',
+      'Chromium Linux Goma RBE Staging (dbg)': 'debug_bot',
     },
 
     'chromium.gpu': {
@@ -296,6 +288,8 @@
       'Android FYI Release (NVIDIA Shield TV)': 'android_release_trybot_arm64',
       'Android FYI 32 Vk Release (Nexus 5X)': 'gpu_tests_android_vulkan_release_trybot',
       'Android FYI 64 Vk Release (Nexus 5X)': 'gpu_tests_android_vulkan_release_trybot_arm64',
+      'Android FYI 32 dEQP Vk Release (Nexus 5X)': 'deqp_android_vulkan_release_trybot',
+      'Android FYI 64 dEQP Vk Release (Nexus 5X)': 'deqp_android_vulkan_release_trybot_arm64',
       'GPU FYI Linux Builder': 'gpu_fyi_tests_release_trybot',
       'GPU FYI Linux Ozone Builder': 'gpu_fyi_tests_ozone_linux_system_gbm_libdrm_release_trybot',
       'GPU FYI Linux Builder (dbg)': 'gpu_fyi_tests_debug_trybot',
@@ -305,11 +299,11 @@
       'GPU FYI Mac dEQP Builder': 'deqp_release_trybot',
       'GPU FYI Win Builder': 'gpu_fyi_tests_release_trybot_x86',
       'GPU FYI Win Builder (dbg)': 'gpu_fyi_tests_debug_trybot_x86',
-      'GPU FYI Win dEQP Builder': 'deqp_release_no_clang_trybot_x86',
+      'GPU FYI Win dEQP Builder': 'deqp_release_trybot_x86',
       'GPU FYI Win Clang Builder (dbg)': 'gpu_fyi_tests_win_clang_debug_bot',
       'GPU FYI Win x64 Builder': 'gpu_fyi_tests_release_trybot',
       'GPU FYI Win x64 Builder (dbg)': 'gpu_fyi_tests_debug_trybot',
-      'GPU FYI Win x64 dEQP Builder': 'deqp_release_no_clang_trybot',
+      'GPU FYI Win x64 dEQP Builder': 'deqp_release_trybot',
       'Linux FYI GPU TSAN Release': 'gpu_fyi_tests_release_trybot_tsan',
       'Mac FYI GPU ASAN Release': 'gpu_fyi_tests_release_trybot_asan',
       'Optional Android Release (Nexus 5X)': 'gpu_tests_android_release_trybot_arm64',
@@ -326,31 +320,28 @@
       'codesearch-gen-chromium-linux': {
         'linux': 'codesearch_gen_chromium_linux_bot',
       },
+      'codesearch-gen-chromium-win': {
+        'win': 'codesearch_gen_chromium_win_bot',
+      },
     },
 
     'chromium.linux': {
-      'Android Arm64 Builder (dbg)': 'android_debug_static_bot_arm64',
-      'Android Builder (dbg)': 'android_debug_static_bot',
-      'Android Builder': 'android_release_bot_minimal_symbols',
-      'Android Clang Builder (dbg)': 'android_clang_asan_debug_bot_minimal_symbols',
-      'Android Tests (dbg)': 'android_debug_static_bot',
-      'Android Tests': 'android_release_bot_minimal_symbols',
-      'Cast Android (dbg)': 'android_cast_debug_static_bot',
-      'Cast Linux': 'cast_release_bot',
       'Cast Audio Linux': 'cast_audio_release_bot',
-      'linux64-jumbo-rel': 'jumbo_release_bot_minimal_symbols',
-      'Leak Detection Linux': 'release_bot',
-      'Linux Builder (dbg)': 'debug_bot',
-      'Linux Builder (dbg)(32)': 'debug_bot_x86',
-      'Linux Builder': 'release_bot',
-      'Deterministic Linux': 'release_bot',
+      'Cast Linux': 'cast_release_bot',
       'Deterministic Linux (dbg)': 'debug_bot',
+      'Deterministic Linux': 'release_bot',
       'Fuchsia ARM64 Cast Audio': 'release_bot_fuchsia_arm64_cast_audio',
       'Fuchsia ARM64': 'release_bot_fuchsia_arm64',
       'Fuchsia x64 Cast Audio': 'release_bot_fuchsia_cast_audio',
       'Fuchsia x64': 'release_bot_fuchsia',
-      'Ozone Linux': 'ozone_linux_release_bot',
+      'Leak Detection Linux': 'release_bot',
+      'Linux Builder (dbg)': 'debug_bot',
+      'Linux Builder (dbg)(32)': 'debug_bot_x86',
+      'Linux Builder': 'release_bot',
       'linux-gcc-rel': 'release_bot_x86_minimal_symbols_no_clang_cxx11',
+      'linux-jumbo-rel': 'jumbo_release_bot_minimal_symbols',
+      'linux-ozone-rel': 'ozone_linux_release_bot',
+      'linux-xenial-rel': 'release_bot',
     },
 
     'chromium.lkgr': {
@@ -377,6 +368,7 @@
     'chromium.mac': {
       'Mac Builder': 'gpu_tests_release_bot',
       'Mac Builder (dbg)': 'debug_bot',
+      'mac-jumbo-rel': 'jumbo_release_bot_minimal_symbols',
       'ios-device': 'ios',
       'ios-device-xcode-clang': 'ios',
       'ios-simulator': 'ios',
@@ -388,7 +380,7 @@
     'chromium.memory': {
       'Android CFI': 'android_cfi_full_cfi_diag_thin_lto_release_static_dcheck_always_on_goma',
       'Linux ASan LSan Builder': 'asan_lsan_release_trybot',
-      'Linux CFI': 'cfi_full_cfi_diag_thin_lto_release_static_dcheck_always_on_goma',
+      'Linux CFI': 'cfi_full_cfi_icall_cfi_diag_thin_lto_release_static_dcheck_always_on_goma',
       'Linux Chromium OS ASan LSan Builder': 'asan_lsan_chromeos_release_trybot',
       'Linux ChromiumOS MSan Builder': 'chromeos_msan_release_bot',
       'Linux MSan Builder': 'msan_release_bot',
@@ -504,13 +496,9 @@
       # Windows bots take too long to link w/ full symbols and time out.
       'Win Builder': 'release_bot_x86_minimal_symbols',
       'Win Builder (dbg)': 'debug_bot_x86_minimal_symbols',
+      'win-jumbo-rel': 'jumbo_release_bot_minimal_symbols',
       'Win x64 Builder': 'release_bot_minimal_symbols',
       'Win x64 Builder (dbg)': 'debug_bot_minimal_symbols',
-      # TODO(thakis): Remove this once WinMSVC64 bots are live (the bots with
-      # unqualified names now use clang).
-      'WinClang64 (dbg)': 'win_clang_release_bot',
-      'WinMSVC64': 'win_msvc_release_bot_compile_only',
-      'WinMSVC64 (dbg)': 'win_msvc_debug_bot_compile_only',
     },
 
     'internal.client.kitchensync': {
@@ -532,7 +520,7 @@
       # '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).
+      # waterfall bots, and run_web_tests.py can't handle that (by design).
       'linux_trusty_blink_compile_dbg': 'debug_trybot',
       'linux_trusty_blink_compile_rel': 'release_bot_minimal_symbols',
       'linux_trusty_blink_dbg': 'debug_trybot',
@@ -550,8 +538,11 @@
     },
 
     'tryserver.chromium.android': {
+      'android-kitkat-arm-rel': 'android_release_trybot',
+      'android-marshmallow-arm64-rel': 'android_release_trybot_arm64_no_symbols',
       'android_archive_rel_ng': 'android_release_trybot',
       'android_arm64_dbg_recipe': 'android_debug_trybot_compile_only_arm64',
+      'android-binary-size': 'android_binary_size',
       'android_blink_rel': 'android_release_trybot',
       'android_cfi_rel_ng': 'android_cfi_full_cfi_diag_thin_lto_release_static_dcheck_always_on_goma',
       'android_clang_dbg_recipe': 'android_clang_asan_debug_trybot_compile_only',
@@ -582,21 +573,16 @@
       'android_angle_deqp_rel_ng': 'deqp_android_release_trybot_arm64',
       'linux_angle_ozone_rel_ng': 'gpu_fyi_tests_ozone_linux_system_gbm_libdrm_release_trybot',
       'linux_angle_dbg_ng': 'gpu_fyi_tests_debug_trybot',
-      'linux_angle_compile_dbg_ng': 'gpu_fyi_tests_debug_trybot',
       'linux_angle_deqp_rel_ng': 'deqp_release_trybot',
       'linux_angle_rel_ng': 'gpu_fyi_tests_release_trybot',
       'mac_angle_dbg_ng': 'gpu_fyi_tests_debug_trybot',
-      'mac_angle_compile_dbg_ng': 'gpu_fyi_tests_debug_trybot',
       'mac_angle_rel_ng': 'gpu_fyi_tests_release_trybot',
       'win_angle_dbg_ng': 'gpu_fyi_tests_debug_trybot_x86',
-      'win_angle_compile_dbg_ng': 'gpu_fyi_tests_debug_trybot_x86',
-      'win_angle_deqp_rel_ng': 'deqp_release_no_clang_trybot_x86',
+      'win_angle_deqp_rel_ng': 'deqp_release_trybot_x86',
       'win_angle_rel_ng': 'gpu_fyi_tests_release_trybot_x86',
       'win_angle_x64_dbg_ng': 'gpu_fyi_tests_debug_trybot',
-      'win_angle_compile_x64_dbg_ng': 'gpu_fyi_tests_debug_trybot',
-      'win_angle_x64_deqp_rel_ng': 'deqp_release_no_clang_trybot',
+      'win_angle_x64_deqp_rel_ng': 'deqp_release_trybot',
       'win_angle_x64_rel_ng': 'gpu_fyi_tests_release_trybot',
-      'win_angle_compile_x64_rel_ng': 'gpu_fyi_tests_release_trybot',
     },
 
     'tryserver.chromium.chromiumos': {
@@ -618,12 +604,18 @@
       'fuchsia_x64_cast_audio': 'release_trybot_fuchsia_cast_audio',
       'layout_test_leak_detection': 'release_trybot',
       'leak_detection_linux': 'release_trybot',
+      'linux-blink-gen-property-trees': 'release_trybot',
+      'linux-blink-heap-incremental-marking': 'debug_trybot_enable_blink_heap_incremental_marking',
       'linux-blink-heap-verification-try': 'release_trybot_enable_blink_heap_verification',
+      'linux-gcc-rel': 'release_bot_x86_minimal_symbols_no_clang_cxx11',
+      'linux-jumbo-rel': 'jumbo_release_bot_minimal_symbols',
+      'linux-ozone-rel': 'ozone_linux_release_trybot',
+      'linux-xenial-rel': 'release_trybot',
       'linux_arm': 'release_trybot_arm',
       'linux_chromium_archive_rel_ng': 'release_bot',
       'linux_chromium_asan_rel_ng': 'asan_lsan_release_trybot',
       'linux_chromium_browser_side_navigation_rel': 'release_trybot',
-      'linux_chromium_cfi_rel_ng': 'cfi_full_cfi_diag_thin_lto_release_static_dcheck_always_on_goma',
+      'linux_chromium_cfi_rel_ng': 'cfi_full_cfi_icall_cfi_diag_thin_lto_release_static_dcheck_always_on_goma',
       'linux_chromium_chromeos_asan_rel_ng': 'asan_lsan_chromeos_release_trybot',
       'linux_chromium_chromeos_msan_rel_ng': 'chromeos_msan_release_bot',
       'linux_chromium_clobber_deterministic': 'release_trybot',
@@ -641,7 +633,6 @@
       # on the continuous builder.
       'linux_chromium_msan_rel_ng': 'msan_release_bot',
 
-      'linux_chromium_ozone_compile_only_ng': 'ozone_linux_release_trybot_compile_only',
       'linux_chromium_rel_ng': 'gpu_tests_release_trybot_no_symbols',
       'linux_chromium_tsan_rel_ng': 'tsan_disable_nacl_release_trybot',
       'linux_layout_tests_layout_ng': 'release_trybot',
@@ -655,7 +646,6 @@
       'linux_site_isolation': 'release_trybot',
       'linux_upload_clang': 'release_bot',
       'linux_vr': 'vr_release_trybot',
-      'linux-gcc-rel': 'release_bot_x86_minimal_symbols_no_clang_cxx11',
     },
 
     'tryserver.chromium.mac': {
@@ -665,6 +655,7 @@
       'ios-simulator-full-configs': 'ios',
       'ios-simulator-cronet': 'ios',
       'ios-simulator-xcode-clang': 'ios',
+      'mac-jumbo-rel': 'jumbo_release_bot_minimal_symbols',
       'mac_chromium_10.10': 'gpu_tests_release_trybot',
       'mac_chromium_10.12_rel_ng': 'gpu_tests_release_trybot',
       'mac_chromium_10.13_rel_ng': 'release_trybot',
@@ -693,10 +684,12 @@
     },
 
     'tryserver.chromium.win': {
+      'gpu_manual_try_win7_nvidia_rel': 'gpu_fyi_tests_release_trybot_x86',
       'win7_chromium_rel_ng': 'gpu_tests_release_trybot_x86_minimal_symbols',
       'win7_chromium_rel_loc_exp': 'gpu_tests_release_trybot_x86_minimal_symbols',
       'win10_chromium_x64_rel_ng': 'release_trybot',
       'win10_chromium_x64_rel_ng_exp': 'release_trybot',
+      'win-jumbo-rel': 'jumbo_release_bot_minimal_symbols',
       'win_chromium_gn_upload': 'release_bot_x86_minimal_symbols',
       'win_x64_archive': 'release_trybot',
       'win_archive': 'release_trybot_x86',
@@ -704,9 +697,6 @@
       'win_chromium_compile_rel_ng': 'gpu_tests_release_trybot_x86_minimal_symbols',
       'win_chromium_dbg_ng': 'debug_trybot_x86_minimal_symbols',
       'win_chromium_x64_rel_ng': 'release_trybot_minimal_symbols',
-      'win_clang': 'win_clang_release_bot',
-      'win-msvc-rel': 'win_msvc_release_bot_compile_only',
-      'win-msvc-dbg': 'win_msvc_debug_bot_compile_only',
       'win_mojo': 'release_trybot_x86',
       'win_nacl_sdk': 'release_bot_x86_minimal_symbols',
       'win_nacl_sdk_build': 'release_bot_x86_minimal_symbols',
@@ -747,6 +737,10 @@
   # is not necessarily so (i.e., we might have mac, win, and linux
   # bots all using the 'release_bot' config).
   'configs': {
+    'android_binary_size': [
+      'android', 'chrome_with_codecs', 'goma', 'minimal_symbols', 'official_optimize',
+    ],
+
     'android_cast_debug_static_bot': [
       'android', 'cast', 'clang', 'debug_static_bot',
     ],
@@ -873,10 +867,6 @@
       'android', 'debug_static_bot', 'x86',
     ],
 
-    'android_debug_static_bot_mipsel': [
-      'android', 'debug_static_bot', 'minimal_symbols', 'mipsel', 'strip_debug_info',
-    ],
-
     'android_debug_trybot': [
       'android', 'debug_trybot',
     ],
@@ -1055,7 +1045,7 @@
     ],
 
     'cast_audio_release_bot': [
-      'cast', 'cast_audio', 'release_bot',
+      'cast', 'cast_audio', 'release_bot', 'minimal_symbols',
     ],
 
     'cast_audio_release_trybot': [
@@ -1066,8 +1056,8 @@
       'cfi_full', 'cfi_icall', 'cfi_diag', 'cfi_recover', 'thin_lto', 'release', 'static',
     ],
 
-    'cfi_full_cfi_diag_thin_lto_release_static_dcheck_always_on_goma': [
-      'cfi_full', 'cfi_diag', 'thin_lto', 'release', 'static', 'dcheck_always_on', 'goma',
+    'cfi_full_cfi_icall_cfi_diag_thin_lto_release_static_dcheck_always_on_goma': [
+      'cfi_full', 'cfi_icall', 'cfi_diag', 'thin_lto', 'release', 'static', 'dcheck_always_on', 'goma',
     ],
 
     'cfi_full_diag_icall_release_static_dcheck_always_on': [
@@ -1132,30 +1122,34 @@
       'clang_tot', 'shared', 'debug',
     ],
 
-    'clang_tot_full_symbols_shared_debug_use_lld': [
-      'clang_tot', 'full_symbols', 'shared', 'debug', 'use_lld',
+    'clang_tot_full_symbols_shared_debug_no_lld': [
+      'clang_tot', 'full_symbols', 'shared', 'debug', 'no_lld',
     ],
 
-    'clang_tot_full_symbols_shared_debug_use_lld_x86': [
-      'clang_tot', 'full_symbols', 'shared', 'debug', 'use_lld', 'x86',
+    'clang_tot_full_symbols_shared_debug_no_lld_x86': [
+      'clang_tot', 'full_symbols', 'shared', 'debug', 'no_lld', 'x86',
     ],
 
     'clang_tot_shared_debug_x86': [
       'clang_tot', 'shared', 'debug', 'x86',
     ],
 
-    'clang_tot_shared_release_use_lld_dcheck': [
-      'clang_tot', 'minimal_symbols', 'shared', 'release', 'use_lld', 'dcheck_always_on',
+    'clang_tot_shared_release_no_lld_dcheck': [
+      'clang_tot', 'minimal_symbols', 'shared', 'release', 'no_lld', 'dcheck_always_on',
     ],
 
-    'clang_tot_official_static_use_lld_x86': [
-      'clang_tot', 'minimal_symbols', 'official', 'static', 'release', 'use_lld', 'x86',
+    'clang_tot_official_static_no_lld_x86': [
+      'clang_tot', 'minimal_symbols', 'official', 'static', 'release', 'no_lld', 'x86',
     ],
 
     'clang_tot_minimal_symbols_shared_release': [
       'clang_tot', 'minimal_symbols', 'shared', 'release',
     ],
 
+    'clang_tot_coverage_minimal_symbols_shared_release': [
+      'clang_tot', 'use_clang_coverage', 'minimal_symbols', 'shared', 'release',
+    ],
+
     'clang_tot_shared_release_dcheck': [
       'clang_tot', 'shared', 'release', 'dcheck_always_on',
     ],
@@ -1205,6 +1199,10 @@
       'goma', 'clang', 'shared', 'debug', 'minimal_symbols', 'x64',
     ],
 
+    'codesearch_gen_chromium_win_bot': [
+      'goma', 'clang', 'shared', 'debug', 'minimal_symbols', 'x64',
+    ],
+
     # The 'cros_chrome_sdk_* configs are placeholders that indicate
     # that the GN args are set by the `cros chrome-sdk`
     # wrapper and need to be looked at specially.
@@ -1228,6 +1226,10 @@
       'debug_bot', 'enable_blink_heap_incremental_marking',
     ],
 
+    'debug_trybot_enable_blink_heap_incremental_marking': [
+      'debug_trybot', 'enable_blink_heap_incremental_marking',
+    ],
+
     'debug_bot_fuchsia': [
       'debug_bot', 'fuchsia',
     ],
@@ -1266,18 +1268,16 @@
       'angle_deqp_tests', 'android', 'release_trybot', 'arm64',
     ],
 
-    'deqp_release_no_clang_trybot': [
-      # TODO(thakis): Remove no_clang once https://crbug.com/727437 is fixed.
-      # Still need conditional entries in .gclient so that clang and compiler
-      # options can be pinned based on the presence of a GN flag.
-      'angle_deqp_tests', 'release_trybot', 'no_clang',
+    'deqp_android_vulkan_release_trybot': [
+      'angle_deqp_tests', 'android', 'vulkan', 'release_trybot',
+    ],
+
+    'deqp_android_vulkan_release_trybot_arm64': [
+      'angle_deqp_tests', 'android', 'vulkan', 'release_trybot', 'arm64',
     ],
 
-    'deqp_release_no_clang_trybot_x86': [
-      # TODO(thakis): Remove no_clang once https://crbug.com/727437 is fixed.
-      # Still need conditional entries in .gclient so that clang and compiler
-      # options can be pinned based on the presence of a GN flag.
-      'angle_deqp_tests', 'release_trybot', 'x86', 'no_clang',
+    'deqp_release_trybot_x86': [
+      'angle_deqp_tests', 'release_trybot', 'x86',
     ],
 
     'deqp_release_trybot': [
@@ -1463,8 +1463,8 @@
       'ozone_linux', 'release_bot',
     ],
 
-    'ozone_linux_release_trybot_compile_only': [
-      'ozone_linux', 'release_trybot', 'compile_only',
+    'ozone_linux_release_trybot': [
+      'ozone_linux', 'release_trybot',
     ],
 
     'presubmit': [
@@ -1546,11 +1546,6 @@
       'release_bot', 'x86', 'minimal_symbols', 'no_com_init_hooks', 'chrome_with_codecs'
     ],
 
-    # TODO(tikuta): Remove this once gcp goma backend supports all windows nacl compilers.
-    'release_bot_x86_minimal_symbols_disable_nacl_no_clang': [
-      'release_bot_x86_minimal_symbols_disable_nacl', 'no_clang'
-    ],
-
     'release_libfuzzer_asan': [
       'release', 'libfuzzer', 'asan', 'chromeos_codecs', 'pdf_xfa', 'disable_nacl', 'optimize_for_fuzzing',
     ],
@@ -1655,45 +1650,10 @@
       'vr', 'release_trybot', 'ozone',
     ],
 
-    'win_clang_release_bot': [
-      # Now that the default win bots use clang, use a "clang" bot to make sure
-      # things stay compilable with msvc. TODO(thakis): Having a "clang" bot
-      # check that is very confusing, so rename the bot to "msvc".
-      'no_clang', 'release_bot', 'minimal_symbols',
-    ],
-
     'win_msvc_release_bot': [
       'no_clang', 'release_bot',
     ],
 
-    'win_msvc_release_bot_compile_only': [
-      'no_clang', 'release_bot', 'compile_only',
-    ],
-
-    'win_msvc_release_bot_x86': [
-      'no_clang', 'minimal_symbols', 'release_bot', 'x86',
-    ],
-
-    'win_msvc_debug_bot': [
-      'no_clang', 'debug_bot',
-    ],
-
-    'win_msvc_debug_bot_compile_only': [
-      'no_clang', 'debug_bot', 'compile_only',
-    ],
-
-    'win_msvc_debug_bot_x86': [
-      'no_clang', 'minimal_symbols', 'debug_bot', 'x86',
-    ],
-
-    'win_msvc_shared_release_bot': [
-      'no_clang', 'minimal_symbols', 'shared_release_bot', 'dcheck_always_on',
-    ],
-
-    'win_msvc_shared_release_bot_x86': [
-      'no_clang', 'minimal_symbols', 'shared_release_bot', 'dcheck_always_on', 'x86',
-    ],
-
     # TODO(tikuta): Remove this once gcp goma backend supports all windows nacl compilers.
     'win_clang_release_bot_disable_nacl': [
       'clang', 'release_bot', 'minimal_symbols', 'disable_nacl',
@@ -1765,7 +1725,7 @@
     },
 
     'cast_audio': {
-      'gn_args': 'is_cast_audio_only=true enable_webrtc=false'
+      'gn_args': 'is_cast_audio_only=true'
     },
 
     'cfi': {
@@ -1826,6 +1786,10 @@
       'gn_args': 'is_clang=false',
     },
 
+    'use_clang_coverage': {
+      'gn_args': 'use_clang_coverage=true',
+    },
+
     'use_cxx11': {
       'gn_args': 'use_cxx11=true',
     },
@@ -2056,7 +2020,6 @@
       'gn_args': ('ozone_auto_platforms=false ozone_platform_wayland=true '
                   'ozone_platform="x11" '
                   'ozone_platform_x11=true ozone_platform_gbm=true '
-                  'enable_mus=true '
                   'use_xkbcommon=true use_ozone=true'),
     },
 
@@ -2082,14 +2045,6 @@
       'mixins': ['release', 'static', 'goma'],
     },
 
-    'release_bot_x86_minimal_symbols': {
-      'mixins':  ['release_bot', 'x86', 'minimal_symbols']
-    },
-
-    'release_bot_x86_minimal_symbols_disable_nacl': {
-      'mixins': ['release_bot_x86_minimal_symbols', 'disable_nacl']
-    },
-
     'release_trybot': {
       'mixins': ['release_bot', 'minimal_symbols', 'dcheck_always_on'],
     },
@@ -2143,6 +2098,10 @@
       'gn_args': 'use_lld=true',
     },
 
+    'no_lld': {
+      'gn_args': 'use_lld=false',
+    },
+
     'use_vaapi': {
       'gn_args': 'use_vaapi=true',
     },
@@ -2187,8 +2146,4 @@
       'gn_args': 'target_cpu="x86"',
     },
   },
-
-  'luci_tryservers': {
-    'chromium.try': [ 'linux_chromium_rel_ng' ],
-  },
 }
diff --git a/chromium/tools/mb/mb_unittest.py b/chromium/tools/mb/mb_unittest.py
index 294a166a7b2..bf6a771e355 100755
--- a/chromium/tools/mb/mb_unittest.py
+++ b/chromium/tools/mb/mb_unittest.py
@@ -190,10 +190,6 @@ TRYSERVER_CONFIG = """\
       'try_builder2': 'fake_config',
     },
   },
-  'luci_tryservers': {
-    'luci_tryserver1': ['luci_builder1'],
-    'luci_tryserver2': ['luci_builder2'],
-  },
   'configs': {},
   'mixins': {},
 }
@@ -631,22 +627,6 @@ class UnitTest(unittest.TestCase):
     mbw.files[mbw.default_config] = TEST_BAD_CONFIG
     self.check(['validate'], mbw=mbw, ret=1)
 
-  def test_buildbucket(self):
-    mbw = self.fake_mbw()
-    mbw.files[mbw.default_config] = TRYSERVER_CONFIG
-    self.check(['gerrit-buildbucket-config'], mbw=mbw,
-               ret=0,
-               out=('# This file was generated using '
-                    '"tools/mb/mb.py gerrit-buildbucket-config".\n'
-                    '[bucket "luci.luci_tryserver1"]\n'
-                    '\tbuilder = luci_builder1\n'
-                    '[bucket "luci.luci_tryserver2"]\n'
-                    '\tbuilder = luci_builder2\n'
-                    '[bucket "master.tryserver.chromium.linux"]\n'
-                    '\tbuilder = try_builder\n'
-                    '[bucket "master.tryserver.chromium.mac"]\n'
-                    '\tbuilder = try_builder2\n'))
-
   def test_build_command_unix(self):
     files = {
       '/fake_src/out/Default/toolchain.ninja': '',