BASELINE: Update Chromium to 66.0.3359.156

Change-Id: I0c9831ad39911a086b6377b16f995ad75a51e441
Reviewed-by: Michal Klocek <michal.klocek@qt.io>

3 files changed, 302 insertions, 211 deletions

diff --git a/chromium/tools/mb/mb.py b/chromium/tools/mb/mb.py
index a28367843b4..7d41da84df0 100755
--- a/chromium/tools/mb/mb.py
+++ b/chromium/tools/mb/mb.py
@@ -91,9 +91,11 @@ class MetaBuildWrapper(object):
                         help='path to config file '
                              '(default is %(default)s)')
       subp.add_argument('-i', '--isolate-map-file', metavar='PATH',
-                        default=self.default_isolate_map,
                         help='path to isolate map file '
-                             '(default is %(default)s)')
+                             '(default is %(default)s)',
+                        default=[],
+                        action='append',
+                        dest='isolate_map_files')
       subp.add_argument('-g', '--goma-dir',
                         help='path to goma directory')
       subp.add_argument('--android-version-code',
@@ -581,14 +583,26 @@ class MetaBuildWrapper(object):
     self.mixins = contents['mixins']
 
   def ReadIsolateMap(self):
-    if not self.Exists(self.args.isolate_map_file):
-      raise MBErr('isolate map file not found at %s' %
-                  self.args.isolate_map_file)
-    try:
-      return ast.literal_eval(self.ReadFile(self.args.isolate_map_file))
-    except SyntaxError as e:
-      raise MBErr('Failed to parse isolate map file "%s": %s' %
-                  (self.args.isolate_map_file, e))
+    if not self.args.isolate_map_files:
+      self.args.isolate_map_files = [self.default_isolate_map]
+
+    for f in self.args.isolate_map_files:
+      if not self.Exists(f):
+        raise MBErr('isolate map file not found at %s' % f)
+    isolate_maps = {}
+    for isolate_map in self.args.isolate_map_files:
+      try:
+        isolate_map = ast.literal_eval(self.ReadFile(isolate_map))
+        duplicates = set(isolate_map).intersection(isolate_maps)
+        if duplicates:
+          raise MBErr(
+              'Duplicate targets in isolate map files: %s.' %
+              ', '.join(duplicates))
+        isolate_maps.update(isolate_map)
+      except SyntaxError as e:
+        raise MBErr(
+            'Failed to parse isolate map file "%s": %s' % (isolate_map, e))
+    return isolate_maps
 
   def ConfigFromArgs(self):
     if self.args.config:
@@ -711,6 +725,8 @@ class MetaBuildWrapper(object):
         return ret
 
     android = 'target_os="android"' in vals['gn_args']
+    fuchsia = 'target_os="fuchsia"' in vals['gn_args']
+    win = self.platform == 'win32' or 'target_os="win"' in vals['gn_args']
     for target in swarming_targets:
       if android:
         # Android targets may be either android_apk or executable. The former
@@ -720,6 +736,11 @@ class MetaBuildWrapper(object):
         runtime_deps_targets = [
             target + '.runtime_deps',
             'obj/%s.stamp.runtime_deps' % label.replace(':', '/')]
+      elif fuchsia:
+        # Only emit a runtime deps file for the group() target on Fuchsia.
+        label = isolate_map[target]['label']
+        runtime_deps_targets = [
+          'obj/%s.stamp.runtime_deps' % label.replace(':', '/')]
       elif (isolate_map[target]['type'] == 'script' or
             isolate_map[target].get('label_type') == 'group'):
         # For script targets, the build target is usually a group,
@@ -729,11 +750,11 @@ class MetaBuildWrapper(object):
         label = isolate_map[target]['label']
         runtime_deps_targets = [
             'obj/%s.stamp.runtime_deps' % label.replace(':', '/')]
-        if self.platform == 'win32':
+        if win:
           runtime_deps_targets += [ target + '.exe.runtime_deps' ]
         else:
           runtime_deps_targets += [ target + '.runtime_deps' ]
-      elif self.platform == 'win32':
+      elif win:
         runtime_deps_targets = [target + '.exe.runtime_deps']
       else:
         runtime_deps_targets = [target + '.runtime_deps']
@@ -885,6 +906,7 @@ class MetaBuildWrapper(object):
 
     is_android = 'target_os="android"' in vals['gn_args']
     is_fuchsia = 'target_os="fuchsia"' in vals['gn_args']
+    is_win = self.platform == 'win32' or 'target_os="win"' in vals['gn_args']
 
     # This should be true if tests with type='windowed_test_launcher' are
     # expected to run using xvfb. For example, Linux Desktop, X11 CrOS and
@@ -903,7 +925,7 @@ class MetaBuildWrapper(object):
     test_type = isolate_map[target]['type']
 
     executable = isolate_map[target].get('executable', target)
-    executable_suffix = '.exe' if self.platform == 'win32' else ''
+    executable_suffix = '.exe' if is_win else ''
 
     cmdline = []
     extra_files = [
diff --git a/chromium/tools/mb/mb_config.pyl b/chromium/tools/mb/mb_config.pyl
index f78812a345a..51e12e0bd3b 100644
--- a/chromium/tools/mb/mb_config.pyl
+++ b/chromium/tools/mb/mb_config.pyl
@@ -27,15 +27,14 @@
       'Android': 'android_without_codecs_release_bot_minimal_symbols',
       'Linux x64': 'release_bot',
       'Mac': 'release_bot_mac_strip',
-      'Win': 'release_bot_x86_minimal_symbols',
-      'Win x64': 'release_bot_minimal_symbols',
+      'Win': 'release_bot_x86_minimal_symbols_enable_archive_compression',
+      'Win x64': 'release_bot_minimal_symbols_enable_archive_compression',
     },
 
     'chromium.android': {
       'Android ASAN (dbg)': 'android_clang_asan_debug_bot_minimal_symbols',
       'Android Cronet ARM64 Builder': 'android_cronet_release_bot_minimal_symbols_arm64',
       'Android Cronet ARM64 Builder (dbg)': 'android_cronet_debug_static_bot_arm64',
-      'Android Cronet ARMv6 Builder': 'android_cronet_release_bot_minimal_symbols_armv6',
       'Android Cronet Builder': 'android_cronet_release_bot_minimal_symbols_arm_no_neon',
       'Android Cronet Builder (dbg)': 'android_cronet_debug_static_bot_arm_no_neon',
       'Android Cronet Builder Asan': 'android_cronet_release_bot_minimal_symbols_arm_no_neon_clang_asan',
@@ -44,7 +43,6 @@
       'Android Cronet Lollipop Builder': 'android_cronet_release_bot_minimal_symbols_arm_no_neon',
       'Android Cronet Marshmallow 64bit Builder': 'android_cronet_release_bot_minimal_symbols_arm64',
       'Android Cronet Marshmallow 64bit Perf': 'android_cronet_release_bot_minimal_symbols_arm64',
-      'Android Cronet MIPS Builder': 'android_cronet_release_bot_minimal_symbols_mipsel',
       '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',
@@ -59,7 +57,6 @@
     },
 
     'chromium.android.fyi': {
-      'Android Cronet ARMv6 Builder': 'android_cronet_release_bot_minimal_symbols_armv6',
       'Android Cronet Builder (dbg)': 'android_cronet_debug_static_bot_arm_no_neon',
       'Android Cronet Builder Asan': 'android_cronet_release_bot_minimal_symbols_arm_no_neon_clang_asan',
       'Android Cronet Data Reduction Proxy Builder': 'android_cronet_data_reduction_proxy_release_bot_minimal_symbols_arm_no_neon',
@@ -128,6 +125,7 @@
       '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',
+      'linux-win_cross-rel': 'win_release_cross',
       'ToTAndroid': 'android_clang_tot_release',
       'ToTAndroid64': 'android_clang_tot_release_arm64',
       'ToTAndroidASan': 'android_clang_tot_asan',
@@ -141,7 +139,7 @@
       'ToTLinuxASan': 'clang_tot_asan_lsan_static_release',
       'ToTLinuxASanLibfuzzer': 'release_libfuzzer_asan_clang_tot',
       'ToTLinuxMSan': 'clang_tot_msan_release',
-      'ToTLinuxThinLTO': 'clang_tot_release_full_symbols_thin_lto_static_use_lld',
+      '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',
       'ToTMac (dbg)': 'clang_tot_shared_debug',
@@ -154,6 +152,7 @@
       'ToTWin64(dll)': 'clang_tot_shared_release_dcheck',
       'ToTWinCFI': 'clang_tot_cfi_full_cfi_diag_thin_lto_release_static_dcheck_always_on_x86',
       'ToTWinCFI64': 'clang_tot_cfi_full_cfi_diag_thin_lto_release_static_dcheck_always_on',
+      'ToTWinLibcxx64': 'clang_tot_official_optimize_minimal_symbols_static_release_libcxx',
       'ToTWinThinLTO64': 'clang_tot_official_full_symbols_thin_lto_static_use_lld',
       'ToTiOS': 'ios',
       'UBSanVptr Linux': 'ubsan_vptr_release_bot',
@@ -176,6 +175,7 @@
       'Linux Builder Goma Canary': 'release_bot',
       'Linux x64 Goma Canary (clobber)': 'release_bot',
       'Linux x64 Goma Canary LocalOutputCache': 'release_bot',
+      'linux-gcc-rel': 'release_bot_x86_minimal_symbols_no_clang_cxx11',
 
       'Chromium Mac 10.10 MacViews': 'mac_views_browser_release_bot',
       'Chromium Mac 10.11': 'release_bot',
@@ -217,14 +217,13 @@
 
       'ios-simulator': 'ios',
       'Headless Linux (dbg)': 'headless_linux_debug_bot',
-      'Jumbo Linux x64': 'jumbo_large_chunks_release_bot',
-      'Jumbo Mac': 'jumbo_release_bot',
-      'Jumbo Win x64': 'jumbo_release_bot',
+      'Jumbo Linux x64': 'jumbo_large_chunks_release_bot_minimal_symbols',
+      'Jumbo Mac': 'jumbo_release_bot_minimal_symbols',
+      'Jumbo Win x64': 'jumbo_release_bot_minimal_symbols',
       'MD Top Chrome ChromeOS material-hybrid': 'chromeos_with_codecs_debug_bot',
       'MD Top Chrome ChromeOS non-material': 'chromeos_with_codecs_debug_bot',
       'MD Top Chrome Win material': 'debug_bot_minimal_symbols',
       'MD Top Chrome Linux material': 'debug_bot',
-      'Leak Detection Linux': 'release_bot',
       'Libfuzzer Upload Linux ASan': 'release_libfuzzer_asan',
       'Libfuzzer Upload Linux ASan Debug': 'debug_libfuzzer_asan',
       'Libfuzzer Upload Linux MSan': 'release_libfuzzer_msan',
@@ -234,19 +233,21 @@
       'Linux ARM (dbg)': 'debug_bot_arm',
       'Linux ARM64': 'release_bot_arm64',
       'Linux ARM64 (dbg)': 'debug_bot_arm64',
+      'linux-blink-heap-incremental-marking': 'debug_bot_enable_blink_heap_incremental_marking',
       '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',
       'Mac deterministic': 'release_bot_mac_strip',
       'Mac deterministic (dbg)': 'debug_bot',
       'Mojo ChromiumOS': 'chromeos_with_codecs_release_trybot',
       'Mojo Android': 'android_release_bot_minimal_symbols_arm64',
       'Mojo Linux': 'release_trybot',
       'Mojo Windows': 'release_bot_x86_minimal_symbols',
-      'Ozone Linux': 'ozone_linux_release_bot',
       'Out of Process Profiling Android': 'android_release_bot_minimal_symbols',
       'Out of Process Profiling Linux': 'release_bot',
       'Out of Process Profiling Mac': 'release_bot',
@@ -284,29 +285,30 @@
 
     'chromium.gpu.fyi': {
       # These all use the 'trybot' mixins to ensure that dcheck is on.
-      'Android dEQP Release (Nexus 5X)': 'deqp_android_release_trybot_arm64',
-      'Android Release (Nexus 5)': 'android_release_trybot',
-      'Android Release (Nexus 5X)': 'gpu_tests_android_release_trybot_arm64',
-      'Android Release (Nexus 6)': 'android_release_trybot',
-      'Android Release (Nexus 6P)': 'android_release_trybot_arm64',
-      'Android Release (Nexus 9)': 'android_release_trybot_arm64',
-      'Android Release (NVIDIA Shield TV)': 'android_release_trybot_arm64',
-      'GPU Linux Builder': 'gpu_fyi_tests_release_trybot',
-      'GPU Linux Ozone Builder': 'gpu_fyi_tests_ozone_linux_system_gbm_libdrm_release_trybot',
-      'GPU Linux Builder (dbg)': 'gpu_fyi_tests_debug_trybot',
-      'GPU Linux dEQP Builder': 'deqp_release_trybot',
-      'GPU Mac Builder': 'gpu_fyi_tests_release_trybot',
-      'GPU Mac Builder (dbg)': 'gpu_fyi_tests_debug_trybot',
-      'GPU Mac dEQP Builder': 'deqp_release_trybot',
-      'GPU Win Builder': 'gpu_fyi_tests_release_trybot_x86',
-      'GPU Win Builder (dbg)': 'gpu_fyi_tests_debug_trybot_x86',
-      'GPU Win dEQP Builder': 'deqp_release_no_clang_trybot_x86',
-      'GPU Win Clang Builder (dbg)': 'gpu_fyi_tests_win_clang_debug_bot',
-      'GPU Win x64 Builder': 'gpu_fyi_tests_release_trybot',
-      'GPU Win x64 Builder (dbg)': 'gpu_fyi_tests_debug_trybot',
-      'GPU Win x64 dEQP Builder': 'deqp_release_no_clang_trybot',
-      'Linux GPU TSAN Release': 'gpu_fyi_tests_release_trybot_tsan',
-      'Mac GPU ASAN Release': 'gpu_fyi_tests_release_trybot_asan',
+      'Android FYI dEQP Release (Nexus 5X)': 'deqp_android_release_trybot_arm64',
+      'Android FYI Release (Nexus 5)': 'android_release_trybot',
+      'Android FYI Release (Nexus 5X)': 'gpu_tests_android_release_trybot_arm64',
+      'Android FYI Release (Nexus 6)': 'android_release_trybot',
+      'Android FYI Release (Nexus 6P)': 'android_release_trybot_arm64',
+      'Android FYI Release (Nexus 9)': 'android_release_trybot_arm64',
+      'Android FYI Release (NVIDIA Shield TV)': 'android_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',
+      'GPU FYI Linux dEQP Builder': 'deqp_release_trybot',
+      'GPU FYI Mac Builder': 'gpu_fyi_tests_release_trybot',
+      'GPU FYI Mac Builder (dbg)': 'gpu_fyi_tests_debug_trybot',
+      '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 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',
+      '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',
     },
 
     'chromium.infra.codesearch': {
@@ -332,6 +334,7 @@
       'Cast Android (dbg)': 'android_cast_debug_static_bot',
       'Cast Linux': 'cast_release_bot',
       'Cast Audio Linux': 'cast_audio_release_bot',
+      'Leak Detection Linux': 'release_bot',
       'Linux Builder (dbg)': 'debug_bot',
       'Linux Builder (dbg)(32)': 'debug_bot_x86',
       'Linux Builder': 'release_bot',
@@ -340,6 +343,7 @@
       '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',
     },
 
     'chromium.lkgr': {
@@ -376,6 +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 Chromium OS ASan LSan Builder': 'asan_lsan_chromeos_release_trybot',
@@ -400,17 +405,9 @@
       'Linux Compile FYI': 'official_goma_perf',
       'Android Builder FYI': 'official_goma_minimal_symbols_android',
       'Android arm64 Builder FYI': 'official_goma_minimal_symbols_android_arm64',
-      'Win Builder FYI': 'official_goma',
-      'Win Clang Builder': 'official_goma_minimal_symbols_clang',
-      'Battor Agent Linux': 'official_goma_minimal_symbols_clang',
-      'Battor Agent Mac': 'official_goma_minimal_symbols_clang',
-      'Battor Agent Win': 'official_goma_minimal_symbols_clang',
-    },
-
-    'chromium.sandbox': {
-      'Linux Builder SANDBOX': 'release_bot',
-      'Deterministic Linux SANDBOX': 'release_bot',
-      'Fuchsia x64 SANDBOX': 'release_bot_fuchsia',
+      'Battor Agent Linux': 'release_bot',
+      'Battor Agent Mac': 'release_bot',
+      'Battor Agent Win': 'release_bot',
     },
 
     'chromium.swarm': {
@@ -439,13 +436,14 @@
 
     'client.v8.fyi': {
       'Android Builder': 'official_goma_minimal_symbols_android',
-      'Android Release (Nexus 5X)': 'gpu_tests_android_release_trybot_arm64',
+      'Android V8 FYI Release (Nexus 5X)': 'gpu_tests_android_release_trybot_arm64',
       'Linux ASAN Builder': 'asan_lsan_release_bot',
       'Linux Debug Builder': 'debug_bot',
-      'Linux Release (NVIDIA)': 'gpu_tests_release_trybot',
+      'Linux V8 FYI Release (NVIDIA)': 'gpu_tests_release_trybot',
       'Linux Release - concurrent marking (NVIDIA)': 'gpu_tests_release_trybot_cm',
+      'Linux V8 FYI Release - concurrent marking (NVIDIA)': 'gpu_tests_release_trybot_cm',
       'Linux Snapshot Builder': 'release_bot',
-      'Mac Release (Intel)': 'gpu_tests_release_trybot',
+      'Mac V8 FYI Release (Intel)': 'gpu_tests_release_trybot',
       'V8 Android GN (dbg)': 'android_debug_bot',
       'V8 Linux GN': 'release_bot',
       'V8-Blink Linux 64': 'release_bot',
@@ -453,7 +451,7 @@
       'V8-Blink Linux 64 (dbg)': 'debug_bot',
       'V8-Blink Mac': 'release_bot',
       'V8-Blink Win': 'release_bot_x86_minimal_symbols',
-      'Win Release (NVIDIA)': 'gpu_tests_release_trybot_x86_minimal_symbols',
+      'Win V8 FYI Release (NVIDIA)': 'gpu_tests_release_trybot_x86_minimal_symbols',
     },
 
     'chromium.webkit': {
@@ -500,8 +498,8 @@
       # 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',
-      'WinMSVC64 (dbg)': 'win_msvc_debug_bot',
+      'WinMSVC64': 'win_msvc_release_bot_compile_only',
+      'WinMSVC64 (dbg)': 'win_msvc_debug_bot_compile_only',
     },
 
     'internal.client.kitchensync': {
@@ -542,13 +540,14 @@
 
     'tryserver.chromium.android': {
       'android_archive_rel_ng': 'android_release_trybot',
-      'android_arm64_dbg_recipe': 'android_debug_trybot_arm64',
+      'android_arm64_dbg_recipe': 'android_debug_trybot_compile_only_arm64',
       'android_blink_rel': 'android_release_trybot',
-      'android_clang_dbg_recipe': 'android_clang_asan_debug_trybot',
-      'android_compile_dbg': 'android_debug_trybot',
-      'android_compile_mips_dbg': 'android_debug_trybot_mipsel',
-      'android_compile_x64_dbg': 'android_debug_trybot_x64',
-      'android_compile_x86_dbg': 'android_debug_trybot_x86',
+      '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',
+      'android_compile_dbg': 'android_debug_trybot_compile_only',
+      'android_compile_mips_dbg': 'android_debug_trybot_compile_only_mipsel',
+      'android_compile_x64_dbg': 'android_debug_trybot_compile_only_x64',
+      'android_compile_x86_dbg': 'android_debug_trybot_compile_only_x86',
       'android_coverage': 'android_debug_trybot_java_coverage',
       'android_cronet': 'android_cronet_release_trybot_arm_no_neon',
 
@@ -558,11 +557,11 @@
 
       'android_mojo': 'android_release_trybot_arm64',
       'android_n5x_swarming_dbg': 'android_debug_trybot_arm64',
-      'android_n5x_swarming_rel': 'android_release_trybot_arm64',
+      'android_n5x_swarming_rel': 'android_release_trybot_arm64_no_symbols',
       'android_optional_gpu_tests_rel': 'gpu_tests_android_release_trybot_arm64',
       'android_unswarmed_n5_rel': 'android_release_trybot',
       'android_unswarmed_n5x_rel': 'android_release_trybot_arm64',
-      'cast_shell_android': 'android_cast_debug_static_bot',
+      'cast_shell_android': 'android_cast_debug_static_bot_compile_only',
       'linux_android_dbg_ng': 'android_debug_trybot',
       'linux_android_rel_ng': 'android_release_trybot',
     },
@@ -599,32 +598,23 @@
     },
 
     'tryserver.chromium.linux': {
-      'cast_shell_linux': 'cast_release_trybot',
       'cast_shell_audio_linux': 'cast_audio_release_trybot',
-      'chromeos_amd64-generic_chromium_compile_only_ng': 'cros_chrome_sdk',
-      'chromeos_daisy_chromium_compile_only_ng': 'cros_chrome_sdk',
+      'cast_shell_linux': 'cast_release_trybot',
       'chromium_presubmit': 'presubmit',
       'closure_compilation': 'closure_compilation',
       'fuchsia_arm64': 'release_trybot_fuchsia_arm64',
       'fuchsia_arm64_cast_audio': 'release_trybot_fuchsia_arm64_cast_audio',
       'fuchsia_x64': 'release_trybot_fuchsia',
       'fuchsia_x64_cast_audio': 'release_trybot_fuchsia_cast_audio',
-      # TODO(kjellander): Remove linux_arm after tryserver restart.
+      'layout_test_leak_detection': 'release_trybot',
+      'leak_detection_linux': 'release_trybot',
       'linux_arm': 'release_trybot_arm',
-      'linux_arm_dbg': 'debug_trybot_arm',
-      'linux_arm_rel': 'release_trybot_arm',
-      'linux_arm64_dbg': 'debug_trybot_arm64',
-      'linux_arm64_rel': 'release_trybot_arm64',
       '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_chromeos_asan_rel_ng': 'asan_lsan_chromeos_release_trybot',
-      'linux_chromium_chromeos_compile_dbg_ng': 'chromeos_with_codecs_debug_trybot',
-      'linux_chromium_chromeos_compile_rel_ng': 'chromeos_with_codecs_release_trybot',
-      'linux_chromium_chromeos_dbg_ng': 'chromeos_with_codecs_debug_trybot',
       'linux_chromium_chromeos_msan_rel_ng': 'chromeos_msan_release_bot',
-      'linux_chromium_chromeos_rel_ng': 'chromeos_with_codecs_release_trybot',
       'linux_chromium_clobber_deterministic': 'release_trybot',
       'linux_chromium_clobber_rel_ng': 'release_trybot',
       'linux_chromium_compile_dbg_32_ng': 'debug_trybot_x86',
@@ -634,29 +624,26 @@
       'linux_chromium_dbg_ng': 'debug_trybot',
       'linux_chromium_gn_upload': 'gn_linux_upload',
       'linux_chromium_headless_rel': 'headless_linux_release_trybot',
-      'linux_chromium_ozone_compile_only_ng': 'ozone_linux_release_trybot',
-      'linux_chromium_ozone_ng': 'ozone_linux_release_trybot',
 
       # This is intentionally a release_bot and not a release_trybot;
       # enabling DCHECKs seems to cause flaky failures that don't show up
       # on the continuous builder.
       'linux_chromium_msan_rel_ng': 'msan_release_bot',
 
-      'linux_chromium_rel_ng': 'gpu_tests_release_trybot',
+      '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_chromium_ubsan_rel_ng': 'ubsan_vptr_release_trybot',
       'linux_layout_tests_layout_ng': 'release_trybot',
       'linux_layout_tests_root_layer_scrolls': 'release_trybot',
       'linux_layout_tests_slimming_paint_v2': 'release_trybot',
       'linux_mojo': 'release_trybot',
       'linux_mojo_chromeos': 'chromeos_with_codecs_release_trybot',
-      'linux_nacl_sdk_build': 'release_bot',
       'linux_nacl_sdk': 'release_bot',
+      'linux_nacl_sdk_build': 'release_bot',
       'linux_optional_gpu_tests_rel': 'gpu_fyi_tests_release_trybot',
       'linux_site_isolation': 'release_trybot',
-      'linux_vr': 'vr_release_trybot',
       'linux_upload_clang': 'release_bot',
-      'leak_detection_linux': 'release_trybot',
+      'linux_vr': 'vr_release_trybot',
     },
 
     'tryserver.chromium.mac': {
@@ -741,12 +728,8 @@
       'win_chromium_syzyasan_rel': 'syzyasan_no_pch_release_x86',
       'win_chromium_x64_rel_ng': 'release_trybot_minimal_symbols',
       'win_clang': 'win_clang_release_bot',
-      'win-msvc-rel': 'win_msvc_release_bot',
-      'win-msvc-dbg': 'win_msvc_debug_bot',
-      'win_clang_dbg': 'clang_debug_trybot_x86',
-      'win_clang_rel': 'clang_official_release_trybot_x86',
-      'win_clang_x64_dbg': 'win_clang_debug_bot',
-      'win_clang_x64_rel': 'clang_official_release_trybot',
+      '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',
@@ -769,6 +752,10 @@
     },
 
     'tryserver.webrtc': {
+      'win_chromium_compile': 'gpu_tests_release_trybot_x86_minimal_symbols',
+      'mac_chromium_compile': 'gpu_tests_release_trybot',
+      'linux_chromium_compile': 'release_trybot',
+      'android_chromium_compile': 'android_release_trybot',
       'win_chromium_webrtc_compile_rel_ng': 'gpu_tests_release_trybot_x86_minimal_symbols',
       'mac_chromium_webrtc_compile_rel_ng': 'gpu_tests_release_trybot',
       'linux_chromium_webrtc_compile_rel_ng': 'release_trybot',
@@ -787,13 +774,21 @@
       'android', 'cast', 'clang', 'debug_static_bot',
     ],
 
+    'android_cast_debug_static_bot_compile_only': [
+      'android', 'cast', 'clang', 'debug_static_bot', 'compile_only',
+    ],
+
+    'android_cfi_full_cfi_diag_thin_lto_release_static_dcheck_always_on_goma': [
+      'android', 'cfi_full', 'cfi_diag', 'thin_lto', 'release', 'static', 'dcheck_always_on', 'goma',
+    ],
+
     'android_clang_asan_debug_bot_minimal_symbols': [
       'android', 'clang', 'asan', 'debug_bot', 'minimal_symbols',
       'strip_debug_info',
     ],
 
-    'android_clang_asan_debug_trybot': [
-      'android', 'clang', 'asan', 'debug_trybot',
+    'android_clang_asan_debug_trybot_compile_only': [
+      'android', 'clang', 'asan', 'debug_trybot', 'compile_only',
     ],
 
     'android_clang_tot_asan': [
@@ -862,11 +857,6 @@
       'strip_debug_info',
     ],
 
-    'android_cronet_release_bot_minimal_symbols_armv6': [
-      'android', 'cronet', 'official_optimize', 'release_bot', 'minimal_symbols', 'armv6',
-      'strip_debug_info',
-    ],
-
     'android_cronet_release_bot_minimal_symbols_arm_no_neon': [
       'android', 'cronet', 'official_optimize', 'release_bot', 'minimal_symbols', 'arm_no_neon',
       'strip_debug_info',
@@ -877,11 +867,6 @@
       'strip_debug_info',
     ],
 
-    'android_cronet_release_bot_minimal_symbols_mipsel': [
-      'android', 'cronet', 'official_optimize', 'release_bot', 'minimal_symbols', 'mipsel',
-      'strip_debug_info',
-    ],
-
     'android_cronet_release_bot_minimal_symbols_x86': [
       'android', 'cronet', 'official_optimize', 'release_bot', 'minimal_symbols', 'x86',
       'strip_debug_info',
@@ -907,64 +892,50 @@
       'android', 'debug_static_bot', 'arm64',
     ],
 
-    'android_debug_trybot': [
-      'android', 'debug_trybot',
+    'android_debug_static_bot_x64': [
+      'android', 'debug_static_bot', 'x64',
     ],
 
-    'android_debug_trybot_arm64': [
-      'android', 'debug_trybot', 'arm64',
+    'android_debug_static_bot_x86': [
+      'android', 'debug_static_bot', 'x86',
     ],
 
-    'android_release_bot_minimal_symbols': [
-      'android', 'release_bot', 'minimal_symbols',
-      'strip_debug_info',
+    'android_debug_static_bot_mipsel': [
+      'android', 'debug_static_bot', 'minimal_symbols', 'mipsel', 'strip_debug_info',
     ],
 
-    'android_release_bot_minimal_symbols_arm64': [
-      'android', 'release_bot', 'minimal_symbols', 'arm64',
-      'strip_debug_info',
+    'android_debug_trybot': [
+      'android', 'debug_trybot',
     ],
 
-    'android_release_thumb_bot': [
-      'android', 'release_bot', 'arm_thumb',
+    'android_debug_trybot_arm64': [
+      'android', 'debug_trybot', 'arm64',
     ],
 
-    'android_release_trybot': [
-      'android', 'release_trybot', 'strip_debug_info',
+    'android_debug_trybot_compile_only': [
+      'android', 'debug_trybot', 'compile_only',
     ],
 
-    'android_release_trybot_arm64': [
-      'android', 'release_trybot', 'arm64', 'strip_debug_info',
+    'android_debug_trybot_compile_only_arm64': [
+      'android', 'debug_trybot', 'compile_only', 'arm64',
     ],
 
-    'android_debug_static_bot_x64': [
-      'android', 'debug_static_bot', 'x64',
+    'android_debug_trybot_compile_only_mipsel': [
+      'android', 'debug_trybot', 'compile_only', 'mipsel',
     ],
 
-    'android_debug_static_bot_x86': [
-      'android', 'debug_static_bot', 'x86',
+    'android_debug_trybot_compile_only_x64': [
+      'android', 'debug_trybot', 'compile_only', 'x64',
     ],
 
-    'android_debug_static_bot_mipsel': [
-      'android', 'debug_static_bot', 'minimal_symbols', 'mipsel', 'strip_debug_info',
+    'android_debug_trybot_compile_only_x86': [
+      'android', 'debug_trybot', 'compile_only', 'x86',
     ],
 
     'android_debug_trybot_java_coverage': [
       'android', 'debug_trybot', 'java_coverage', 'strip_debug_info',
     ],
 
-    'android_debug_trybot_mipsel': [
-      'android', 'debug_trybot', 'mipsel', 'strip_debug_info',
-    ],
-
-    'android_debug_trybot_x64': [
-      'android', 'debug_trybot', 'x64', 'strip_debug_info',
-    ],
-
-    'android_debug_trybot_x86': [
-      'android', 'debug_trybot', 'x86', 'strip_debug_info',
-    ],
-
     'android_ndk_next_release_bot_minimal_symbols': [
       'android', 'ndk_next', 'release_bot', 'minimal_symbols', 'strip_debug_info',
     ],
@@ -986,19 +957,33 @@
     ],
 
     'android_release_bot_minimal_symbols': [
-      'android', 'release_bot', 'minimal_symbols', 'strip_debug_info',
+      'android', 'release_bot', 'minimal_symbols',
+      'strip_debug_info',
     ],
 
-    'android_shared_release_bot_x64': [
-      'android_without_codecs', 'shared_release_bot', 'x64', 'dcheck_always_on',
+    'android_release_bot_minimal_symbols_arm64': [
+      'android', 'release_bot', 'minimal_symbols', 'arm64',
+      'strip_debug_info',
+    ],
+
+    'android_release_thumb_bot': [
+      'android', 'release_bot', 'arm_thumb',
     ],
 
     'android_release_trybot': [
-      'android', 'release_trybot',
+      'android', 'release_trybot', 'strip_debug_info',
     ],
 
     'android_release_trybot_arm64': [
-      'android', 'release_trybot', 'arm64',
+      'android', 'release_trybot', 'arm64', 'strip_debug_info',
+    ],
+
+    'android_release_trybot_arm64_no_symbols': [
+      'android', 'release_trybot', 'arm64', 'no_symbols',
+    ],
+
+    'android_shared_release_bot_x64': [
+      'android_without_codecs', 'shared_release_bot', 'x64', 'dcheck_always_on',
     ],
 
     'android_without_codecs_release_bot_minimal_symbols': [
@@ -1110,7 +1095,7 @@
     ],
 
     'cfi_full_diag_icall_release_static_dcheck_always_on': [
-      'cfi_full', 'cfi_diag', 'cfi_icall', 'thin_lto', 'release', 'static', 'dcheck_always_on',
+      'cfi_full', 'cfi_diag', 'cfi_icall', 'clang_tot', 'thin_lto', 'release', 'static', 'dcheck_always_on',
     ],
 
     'chromeos_asan_lsan_edge_fuzzer_v8_heap_release_bot': [
@@ -1125,10 +1110,6 @@
       'chromeos_with_codecs', 'debug_bot', 'use_vaapi',
     ],
 
-    'chromeos_with_codecs_debug_trybot': [
-      'chromeos_with_codecs', 'debug_trybot', 'use_vaapi',
-    ],
-
     'chromeos_with_codecs_release_bot': [
       'chromeos_with_codecs', 'release_bot', 'use_vaapi',
     ],
@@ -1137,23 +1118,10 @@
       'chromeos_with_codecs', 'release_trybot', 'use_vaapi',
     ],
 
-    'clang_debug_trybot_x86': [
-      'clang', 'debug_trybot', 'x86',
-    ],
-
     'clang_release_bot_minimal_symbols_x86': [
       'clang', 'release_bot', 'minimal_symbols', 'x86',
     ],
 
-
-    'clang_official_release_trybot': [
-      'clang', 'official', 'release_trybot',
-    ],
-
-    'clang_official_release_trybot_x86': [
-      'clang', 'official', 'release_trybot', 'x86',
-    ],
-
     'clang_tot_asan_lsan_static_release': [
       'clang_tot', 'asan', 'lsan', 'static', 'release',
     ],
@@ -1228,8 +1196,12 @@
       'clang_tot', 'official', 'minimal_symbols', 'static', 'release', 'x86',
     ],
 
-    'clang_tot_release_full_symbols_thin_lto_static_use_lld': [
-      'clang_tot', 'release', 'full_symbols', 'thin_lto', 'static', 'use_lld',
+    'clang_tot_official_optimize_minimal_symbols_static_release_libcxx': [
+      'clang_tot', 'official_optimize', 'minimal_symbols', 'static', 'release', 'libcxx',
+    ],
+
+    'clang_tot_release_minimal_symbols_thin_lto_static_use_lld': [
+      'clang_tot', 'release', 'minimal_symbols', 'thin_lto', 'static', 'use_lld',
     ],
 
     'clang_tot_shared_debug': [
@@ -1272,6 +1244,10 @@
       'debug_bot', 'arm64',
     ],
 
+    'debug_bot_enable_blink_heap_incremental_marking': [
+      'debug_bot', 'enable_blink_heap_incremental_marking',
+    ],
+
     'debug_bot_fuchsia': [
       'debug_bot', 'fuchsia',
     ],
@@ -1298,14 +1274,6 @@
       'debug_trybot',
     ],
 
-    'debug_trybot_arm': [
-      'debug_trybot', 'arm',
-    ],
-
-    'debug_trybot_arm64': [
-      'debug_trybot', 'arm64',
-    ],
-
     'debug_trybot_x86': [
       'debug_trybot', 'x86',
     ],
@@ -1365,7 +1333,7 @@
     ],
 
     'gpu_fyi_tests_win_clang_debug_bot': [
-      'gpu_tests', 'internal_gles2_conform_tests', 'clang', 'debug_bot', 'minimal_symbols',
+      'gpu_tests', 'internal_gles_conform_tests', 'clang', 'debug_bot', 'minimal_symbols',
     ],
 
     'gpu_tests_android_release_trybot_arm64': [
@@ -1384,6 +1352,10 @@
       'gpu_tests', 'release_trybot',
     ],
 
+    'gpu_tests_release_trybot_no_symbols': [
+      'gpu_tests', 'release_trybot', 'no_symbols',
+    ],
+
     'gpu_tests_release_trybot_cm': [
       'gpu_tests', 'release_trybot', 'v8_concurrent_marking',
     ],
@@ -1415,12 +1387,12 @@
     # build files.
     'ios': [ 'error'],
 
-    'jumbo_release_bot': [
-      'jumbo', 'release_bot'
+    'jumbo_release_bot_minimal_symbols': [
+      'jumbo', 'release_bot', 'minimal_symbols'
     ],
 
-    'jumbo_large_chunks_release_bot': [
-      'jumbo_non_goma_chunks', 'release_bot'
+    'jumbo_large_chunks_release_bot_minimal_symbols': [
+      'jumbo_non_goma_chunks', 'release_bot', 'minimal_symbols'
     ],
 
     'linux_chromium_analysis': [
@@ -1451,10 +1423,6 @@
       'msan', 'release_bot',
     ],
 
-    'official_goma_minimal_symbols_clang': [
-      'official', 'goma', 'minimal_symbols', 'clang',
-    ],
-
     'official_goma': [
       'official', 'goma',
     ],
@@ -1499,8 +1467,8 @@
       'ozone_linux', 'release_bot',
     ],
 
-    'ozone_linux_release_trybot': [
-      'ozone_linux', 'release_trybot',
+    'ozone_linux_release_trybot_compile_only': [
+      'ozone_linux', 'release_trybot', 'compile_only',
     ],
 
     'presubmit': [
@@ -1562,6 +1530,14 @@
     'release_bot_minimal_symbols': [ 'release_bot', 'minimal_symbols' ],
     'release_bot_x86_minimal_symbols': [ 'release_bot', 'x86', 'minimal_symbols' ],
 
+    'release_bot_minimal_symbols_enable_archive_compression': [
+      'release_bot', 'minimal_symbols', 'enable_archive_compression'
+    ],
+
+    'release_bot_x86_minimal_symbols_enable_archive_compression': [
+      'release_bot', 'x86', 'minimal_symbols', 'enable_archive_compression'
+    ],
+
     'release_bot_x86_minimal_symbols_no_com_init_hooks': [
       'release_bot', 'x86', 'minimal_symbols', 'no_com_init_hooks'
     ],
@@ -1603,10 +1579,6 @@
       'release_trybot', 'arm',
     ],
 
-    'release_trybot_arm64': [
-      'release_trybot', 'arm64',
-    ],
-
     'release_trybot_fuchsia': [
       'release_trybot', 'fuchsia',
     ],
@@ -1631,6 +1603,10 @@
       'release_bot', 'x86', 'minimal_symbols', 'no_clang',
     ],
 
+    'release_bot_x86_minimal_symbols_no_clang_cxx11': [
+      'release_bot', 'x86', 'minimal_symbols', 'no_clang', 'use_cxx11',
+    ],
+
     'syzyasan_no_pch_release_x86': [
       'syzyasan', 'no_pch', 'release', 'x86',
       # The SyzyASAN build may default dcheck_always_on to true to produce
@@ -1663,10 +1639,6 @@
       'ubsan_vptr', 'ubsan_no_recover_hack', 'release_bot',
     ],
 
-    'ubsan_vptr_release_trybot': [
-      'ubsan_vptr', 'ubsan_no_recover_hack', 'release_trybot',
-    ],
-
     'v8_future_debug_bot': [
       'v8_future', 'debug_bot',
     ],
@@ -1683,13 +1655,6 @@
       'vr', 'release_trybot', 'ozone',
     ],
 
-    'win_clang_debug_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', 'debug_bot', 'minimal_symbols',
-    ],
-
     '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
@@ -1698,7 +1663,11 @@
     ],
 
     'win_msvc_release_bot': [
-      'no_clang', 'minimal_symbols', 'release_bot',
+      'no_clang', 'release_bot',
+    ],
+
+    'win_msvc_release_bot_compile_only': [
+      'no_clang', 'release_bot', 'compile_only',
     ],
 
     'win_msvc_release_bot_x86': [
@@ -1706,7 +1675,11 @@
     ],
 
     'win_msvc_debug_bot': [
-      'no_clang', 'minimal_symbols', 'debug_bot',
+      'no_clang', 'debug_bot',
+    ],
+
+    'win_msvc_debug_bot_compile_only': [
+      'no_clang', 'debug_bot', 'compile_only',
     ],
 
     'win_msvc_debug_bot_x86': [
@@ -1726,6 +1699,10 @@
       'clang', 'release_bot', 'minimal_symbols', 'disable_nacl',
     ],
 
+    'win_release_cross': [
+      'win_cross', 'minimal_symbols', 'shared', 'release', 'dcheck_always_on',
+    ],
+
     'windows_analyze': [
       'no_symbols', 'no_pch', 'shared', 'x86', 'win_analyze',
     ],
@@ -1762,10 +1739,6 @@
       'gn_args': 'target_cpu="arm64"',
     },
 
-    'armv6': {
-      'gn_args': 'arm_version=6',
-    },
-
     'arm_no_neon': {
       'mixins': ['arm'],
       'gn_args': 'arm_use_neon=false',
@@ -1848,6 +1821,14 @@
       'gn_args': 'is_clang=false',
     },
 
+    'use_cxx11': {
+      'gn_args': 'use_cxx11=true',
+    },
+
+    'compile_only': {
+      'mixins': ['no_symbols'],
+    },
+
     'cronet': {
       'gn_args': ('disable_file_support=true disable_ftp_support=true '
                   'enable_websockets=false use_platform_icu_alternatives=true '
@@ -1903,6 +1884,17 @@
       'gn_args': 'sanitizer_coverage_flags="trace-pc-guard"',
     },
 
+    'enable_blink_heap_incremental_marking': {
+      'gn_args': 'enable_blink_heap_incremental_marking=true',
+    },
+
+    # This config enable compression on main waterfall win builder to reduce the
+    # size of chrome installer which are downloaded by bysecting script many
+    # times.
+    'enable_archive_compression': {
+      'gn_args': 'skip_archive_compression=false',
+    },
+
     # This mixin is used to force configs that use it to fail. It
     # is used in two cases: when we have bots that we haven't looked
     # at yet and don't know whether they need MB or not, and for bots
@@ -1941,7 +1933,7 @@
     },
 
     'gpu_fyi_tests': {
-      'mixins': ['gpu_tests', 'internal_gles2_conform_tests'],
+      'mixins': ['gpu_tests', 'internal_gles_conform_tests'],
     },
 
     'gpu_tests': {
@@ -1965,8 +1957,8 @@
       'gn_args': 'include_vr_data=true',
     },
 
-    'internal_gles2_conform_tests': {
-      'gn_args': 'internal_gles2_conform_tests=true',
+    'internal_gles_conform_tests': {
+      'gn_args': 'internal_gles2_conform_tests=true build_angle_gles1_conform_tests=true',
     },
 
     'java_coverage': {
@@ -1981,6 +1973,10 @@
       'gn_args': 'use_jumbo_build=true jumbo_file_merge_limit=50',
     },
 
+    'libcxx': {
+      'gn_args': 'use_custom_libcxx=true',
+    },
+
     'libfuzzer': { 'gn_args': 'use_libfuzzer=true' },
 
     'lsan': {
@@ -2166,6 +2162,10 @@
       'gn_args': 'enable_vr=true',
     },
 
+    'win_cross': {
+      'gn_args': 'target_os="win"',
+    },
+
     'win_analyze': {
       'gn_args': 'use_vs_code_analysis=true',
     },
diff --git a/chromium/tools/mb/mb_unittest.py b/chromium/tools/mb/mb_unittest.py
index dfd8f7f5c4c..287e271f963 100755
--- a/chromium/tools/mb/mb_unittest.py
+++ b/chromium/tools/mb/mb_unittest.py
@@ -437,6 +437,75 @@ class UnitTest(unittest.TestCase):
                   mbw.files)
 
 
+  def test_multiple_isolate_maps(self):
+    files = {
+      '/tmp/swarming_targets': 'cc_perftests\n',
+      '/fake_src/testing/buildbot/gn_isolate_map.pyl': (
+          "{'cc_perftests': {"
+          "  'label': '//cc:cc_perftests',"
+          "  'type': 'raw',"
+          "  'args': [],"
+          "}}\n"
+      ),
+      '/fake_src/testing/buildbot/gn_isolate_map2.pyl': (
+          "{'cc_perftests2': {"
+          "  'label': '//cc:cc_perftests',"
+          "  'type': 'raw',"
+          "  'args': [],"
+          "}}\n"
+      ),
+      'c:\\fake_src\out\Default\cc_perftests.exe.runtime_deps': (
+          "cc_perftests\n"
+      ),
+    }
+    mbw = self.fake_mbw(files=files, win32=True)
+    self.check(['gen',
+                '-c', 'debug_goma',
+                '--swarming-targets-file', '/tmp/swarming_targets',
+                '--isolate-map-file',
+                '/fake_src/testing/buildbot/gn_isolate_map.pyl',
+                '--isolate-map-file',
+                '/fake_src/testing/buildbot/gn_isolate_map2.pyl',
+                '//out/Default'], mbw=mbw, ret=0)
+    self.assertIn('c:\\fake_src\\out\\Default\\cc_perftests.isolate',
+                  mbw.files)
+    self.assertIn('c:\\fake_src\\out\\Default\\cc_perftests.isolated.gen.json',
+                  mbw.files)
+
+
+  def test_duplicate_isolate_maps(self):
+    files = {
+      '/tmp/swarming_targets': 'cc_perftests\n',
+      '/fake_src/testing/buildbot/gn_isolate_map.pyl': (
+          "{'cc_perftests': {"
+          "  'label': '//cc:cc_perftests',"
+          "  'type': 'raw',"
+          "  'args': [],"
+          "}}\n"
+      ),
+      '/fake_src/testing/buildbot/gn_isolate_map2.pyl': (
+          "{'cc_perftests': {"
+          "  'label': '//cc:cc_perftests',"
+          "  'type': 'raw',"
+          "  'args': [],"
+          "}}\n"
+      ),
+      'c:\\fake_src\out\Default\cc_perftests.exe.runtime_deps': (
+          "cc_perftests\n"
+      ),
+    }
+    mbw = self.fake_mbw(files=files, win32=True)
+    # Check that passing duplicate targets into mb fails.
+    self.check(['gen',
+                '-c', 'debug_goma',
+                '--swarming-targets-file', '/tmp/swarming_targets',
+                '--isolate-map-file',
+                '/fake_src/testing/buildbot/gn_isolate_map.pyl',
+                '--isolate-map-file',
+                '/fake_src/testing/buildbot/gn_isolate_map2.pyl',
+                '//out/Default'], mbw=mbw, ret=1)
+
+
   def test_isolate(self):
     files = {
       '/fake_src/out/Default/toolchain.ninja': "",