BASELINE: Update Chromium to 85.0.4183.14085-based

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

2 files changed, 23 insertions, 52 deletions

diff --git a/chromium/v8/infra/mb/mb_config.pyl b/chromium/v8/infra/mb/mb_config.pyl
index d4abcf89eb1..c7c251a9e67 100644
--- a/chromium/v8/infra/mb/mb_config.pyl
+++ b/chromium/v8/infra/mb/mb_config.pyl
@@ -211,13 +211,12 @@
       'v8_linux_dbg_ng': 'debug_x86_trybot',
       'v8_linux_noi18n_compile_dbg': 'debug_x86_no_i18n',
       'v8_linux_noi18n_rel_ng': 'release_x86_no_i18n_trybot',
-      'v8_linux_gc_stress_dbg': 'debug_x86_trybot',
+      'v8_linux_gc_stress_dbg_ng': 'debug_x86_trybot',
       'v8_linux_gcc_compile_rel': 'release_x86_gcc_minimal_symbols',
-      'v8_linux_gcc_rel': 'release_x86_gcc_minimal_symbols',
+      'v8_linux_gcc_rel_ng': 'release_x86_gcc_minimal_symbols',
       'v8_linux_shared_compile_rel': 'release_x86_shared_verify_heap',
       'v8_linux64_arm64_pointer_compression_rel_ng':
           'release_simulate_arm64_pointer_compression',
-      'v8_linux64_compile_rel_xg': 'release_x64_test_features_trybot',
       'v8_linux64_dbg_ng': 'debug_x64_trybot',
       'v8_linux64_gc_stress_custom_snapshot_dbg_ng': 'debug_x64_trybot_custom',
       'v8_linux64_gcc_compile_dbg': 'debug_x64_gcc',
@@ -231,39 +230,37 @@
       'v8_linux64_verify_csa_rel_ng': 'release_x64_verify_csa',
       'v8_linux64_asan_rel_ng': 'release_x64_asan_minimal_symbols',
       'v8_linux64_cfi_rel_ng': 'release_x64_cfi',
-      'v8_linux64_msan_rel': 'release_simulate_arm64_msan_minimal_symbols',
-      'v8_linux64_sanitizer_coverage_rel':
-          'release_x64_asan_minimal_symbols_coverage',
-      'v8_linux64_tsan_rel': 'release_x64_tsan_minimal_symbols',
+      'v8_linux64_msan_rel_ng': 'release_simulate_arm64_msan_minimal_symbols',
+      'v8_linux64_tsan_rel_ng': 'release_x64_tsan_minimal_symbols',
       'v8_linux64_tsan_isolates_rel_ng':
           'release_x64_tsan_minimal_symbols',
       'v8_linux64_ubsan_rel_ng': 'release_x64_ubsan_minimal_symbols',
       'v8_odroid_arm_rel_ng': 'release_arm',
       'v8_linux_torque_compare': 'torque_compare',
       # TODO(machenbach): Remove after switching to x64 on infra side.
-      'v8_win_dbg': 'debug_x86_trybot',
+      'v8_win_dbg_ng': 'debug_x86_trybot',
       'v8_win_compile_dbg': 'debug_x86_trybot',
       'v8_win_rel_ng': 'release_x86_trybot',
       'v8_win64_asan_rel_ng': 'release_x64_asan_no_lsan',
       'v8_win64_msvc_compile_rel': 'release_x64_msvc',
-      'v8_win64_dbg': 'debug_x64_minimal_symbols',
+      'v8_win64_dbg_ng': 'debug_x64_minimal_symbols',
       'v8_win64_msvc_rel_ng': 'release_x64_msvc',
       'v8_win64_rel_ng': 'release_x64_trybot',
-      'v8_mac64_gc_stress_dbg': 'debug_x64_trybot',
+      'v8_mac64_gc_stress_dbg_ng': 'debug_x64_trybot',
       'v8_mac64_rel_ng': 'release_x64_trybot',
       'v8_mac64_dbg': 'debug_x64',
       'v8_mac64_dbg_ng': 'debug_x64',
       'v8_mac64_compile_full_dbg_ng': 'full_debug_x64',
-      'v8_mac64_asan_rel': 'release_x64_asan_no_lsan',
+      'v8_mac64_asan_rel_ng': 'release_x64_asan_no_lsan',
       'v8_linux_arm_rel_ng': 'release_simulate_arm_trybot',
       'v8_linux_arm_lite_rel_ng': 'release_simulate_arm_lite_trybot',
-      'v8_linux_arm_dbg': 'debug_simulate_arm',
+      'v8_linux_arm_dbg_ng': 'debug_simulate_arm',
       'v8_linux_arm_armv8a_rel': 'release_simulate_arm_trybot',
       'v8_linux_arm_armv8a_dbg': 'debug_simulate_arm',
       'v8_linux_arm64_rel_ng': 'release_simulate_arm64_trybot',
       'v8_linux_arm64_cfi_rel_ng' : 'release_simulate_arm64_cfi',
-      'v8_linux_arm64_dbg': 'debug_simulate_arm64',
-      'v8_linux_arm64_gc_stress_dbg': 'debug_simulate_arm64',
+      'v8_linux_arm64_dbg_ng': 'debug_simulate_arm64',
+      'v8_linux_arm64_gc_stress_dbg_ng': 'debug_simulate_arm64',
       'v8_linux_mipsel_compile_rel': 'release_simulate_mipsel',
       'v8_linux_mips64el_compile_rel': 'release_simulate_mips64el',
     },
@@ -431,8 +428,6 @@
       'release_bot', 'x64', 'asan', 'lsan'],
     'release_x64_asan_minimal_symbols': [
       'release_bot', 'x64', 'asan', 'lsan', 'minimal_symbols'],
-    'release_x64_asan_minimal_symbols_coverage': [
-      'release_bot', 'x64', 'asan', 'bb', 'coverage', 'lsan', 'minimal_symbols'],
     'release_x64_asan_no_lsan': [
       'release_bot', 'x64', 'asan'],
     'release_x64_asan_no_lsan_verify_heap': [
@@ -593,10 +588,6 @@
       'gn_args': 'is_asan=true',
     },
 
-    'bb': {
-      'gn_args': 'sanitizer_coverage_flags="bb,trace-pc-guard"',
-    },
-
     'cfi': {
       'mixins': ['v8_enable_test_features'],
       'gn_args': ('is_cfi=true use_cfi_cast=true use_cfi_icall=true '
diff --git a/chromium/v8/infra/testing/builders.pyl b/chromium/v8/infra/testing/builders.pyl
index 72f739487cc..797db5504c0 100644
--- a/chromium/v8/infra/testing/builders.pyl
+++ b/chromium/v8/infra/testing/builders.pyl
@@ -83,7 +83,7 @@
       {'name': 'v8testing', 'variant': 'extra', 'shards': 2},
     ],
   },
-  'v8_linux_gc_stress_dbg': {
+  'v8_linux_gc_stress_dbg_ng_triggered': {
     'swarming_dimensions' : {
       'os': 'Ubuntu-16.04',
     },
@@ -92,7 +92,7 @@
       {'name': 'd8testing', 'test_args': ['--gc-stress'], 'shards': 5},
     ],
   },
-  'v8_linux_gcc_rel': {
+  'v8_linux_gcc_rel_ng_triggered': {
     'swarming_dimensions' : {
       'os': 'Ubuntu-16.04',
     },
@@ -214,7 +214,7 @@
   },
   ##############################################################################
   # Linux32 with arm simulators
-  'v8_linux_arm_dbg': {
+  'v8_linux_arm_dbg_ng_triggered': {
     'swarming_dimensions' : {
       'os': 'Ubuntu-16.04',
     },
@@ -321,7 +321,7 @@
       {'name': 'mjsunit', 'variant': 'stress_snapshot'},
     ],
   },
-  'v8_linux64_msan_rel': {
+  'v8_linux64_msan_rel_ng_triggered': {
     'swarming_dimensions' : {
       'os': 'Ubuntu-16.04',
     },
@@ -391,27 +391,7 @@
       {'name': 'v8testing', 'variant': 'stress_instruction_scheduling'},
     ],
   },
-  # TODO(machenbach): Experimental builder with incomplete configs. Should be
-  # similar to v8_linux64_rel_ng_triggered after testing.
-  'v8_linux64_rel_xg': {
-    'swarming_dimensions' : {
-      'cpu': 'x86-64-avx2',
-      'os': 'Ubuntu-16.04',
-    },
-    'tests': [
-      {'name': 'v8initializers'},
-      {'name': 'v8testing', 'shards': 2},
-    ],
-  },
-  'v8_linux64_sanitizer_coverage_rel': {
-    'swarming_dimensions' : {
-      'os': 'Ubuntu-16.04',
-    },
-    'tests': [
-      {'name': 'v8testing', 'shards': 3},
-    ],
-  },
-  'v8_linux64_tsan_rel': {
+  'v8_linux64_tsan_rel_ng_triggered': {
     'swarming_dimensions' : {
       'os': 'Ubuntu-16.04',
     },
@@ -450,7 +430,7 @@
   },
   ##############################################################################
   # Linux64 with arm64 simulators
-  'v8_linux_arm64_dbg': {
+  'v8_linux_arm64_dbg_ng_triggered': {
     'swarming_dimensions' : {
       'os': 'Ubuntu-16.04',
     },
@@ -463,7 +443,7 @@
       {'name': 'v8testing', 'variant': 'trusted', 'shards': 5},
     ],
   },
-  'v8_linux_arm64_gc_stress_dbg': {
+  'v8_linux_arm64_gc_stress_dbg_ng_triggered': {
     'swarming_dimensions' : {
       'os': 'Ubuntu-16.04',
     },
@@ -521,7 +501,7 @@
   },
   ##############################################################################
   # Win32
-  'v8_win_dbg': {
+  'v8_win_dbg_ng_triggered': {
     'swarming_dimensions' : {
       'cpu': 'x86-64',
       'os': 'Windows-7-SP1',
@@ -552,7 +532,7 @@
       {'name': 'v8testing', 'shards': 5},
     ],
   },
-  'v8_win64_dbg': {
+  'v8_win64_dbg_ng_triggered': {
     'swarming_dimensions' : {
       'cpu': 'x86-64',
       'os': 'Windows-10-15063',
@@ -589,7 +569,7 @@
   },
   ##############################################################################
   # Mac64
-  'v8_mac64_asan_rel': {
+  'v8_mac64_asan_rel_ng_triggered': {
     'swarming_dimensions' : {
       'cpu': 'x86-64',
       'os': 'Mac-10.13',
@@ -610,7 +590,7 @@
       {'name': 'v8testing', 'variant': 'extra', 'shards': 2},
     ],
   },
-  'v8_mac64_gc_stress_dbg': {
+  'v8_mac64_gc_stress_dbg_ng_triggered': {
     'swarming_dimensions' : {
       'cpu': 'x86-64',
       'os': 'Mac-10.13',
@@ -1078,7 +1058,7 @@
       {'name': 'v8testing', 'variant': 'slow_path', 'shards': 1},
     ],
   },
-  'V8 Linux64 TSAN - concurrent marking': {
+  'V8 Linux64 TSAN - stress-incremental-marking': {
     'swarming_dimensions' : {
       'os': 'Ubuntu-16.04',
     },