BASELINE: Update Chromium to 85.0.4183.14085-based

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

5 files changed, 12 insertions, 33 deletions

diff --git a/chromium/third_party/webrtc/tools_webrtc/get_landmines.py b/chromium/third_party/webrtc/tools_webrtc/get_landmines.py
index ba8ac9c1bf7..399fb0ad72d 100755
--- a/chromium/third_party/webrtc/tools_webrtc/get_landmines.py
+++ b/chromium/third_party/webrtc/tools_webrtc/get_landmines.py
@@ -43,6 +43,7 @@ def print_landmines():  # pylint: disable=invalid-name
            'https://codereview.webrtc.org/2786603002')
     print ('Clobber due to Win Debug linking errors in '
            'https://codereview.webrtc.org/2832063003/')
+    print 'Clobber win x86 bots (issues with isolated files).'
   if host_os() == 'mac':
     print 'Clobber due to iOS compile errors (crbug.com/694721)'
     print 'Clobber to unblock https://codereview.webrtc.org/2709573003'
diff --git a/chromium/third_party/webrtc/tools_webrtc/libs/generate_licenses.py b/chromium/third_party/webrtc/tools_webrtc/libs/generate_licenses.py
index 04d655cba06..0e5a9ef2791 100755
--- a/chromium/third_party/webrtc/tools_webrtc/libs/generate_licenses.py
+++ b/chromium/third_party/webrtc/tools_webrtc/libs/generate_licenses.py
@@ -78,6 +78,7 @@ LIB_TO_LICENSES_DICT = {
     # Compile time dependencies, no license needed:
     'yasm': [],
     'ow2_asm': [],
+    'jdk': [],
 }
 
 # Third_party library _regex_ to licences mapping. Keys are regular expression
diff --git a/chromium/third_party/webrtc/tools_webrtc/mb/mb_config.pyl b/chromium/third_party/webrtc/tools_webrtc/mb/mb_config.pyl
index 059c724194c..9f9fdd2d41d 100644
--- a/chromium/third_party/webrtc/tools_webrtc/mb/mb_config.pyl
+++ b/chromium/third_party/webrtc/tools_webrtc/mb/mb_config.pyl
@@ -404,13 +404,16 @@
       'ios', 'release_bot', 'arm64', 'no_ios_code_signing', 'ios_use_goma_rbe'
     ],
     'ios_internal_debug_bot_arm64': [
-      'ios', 'debug_bot', 'arm64', 'ios_use_goma_rbe'
+      'ios', 'debug_bot', 'arm64', 'ios_use_goma_rbe',
+      'ios_code_signing_identity_description',
     ],
     'ios_internal_release_bot_arm64': [
-      'ios', 'release_bot', 'arm64', 'ios_use_goma_rbe'
+      'ios', 'release_bot', 'arm64', 'ios_use_goma_rbe',
+      'ios_code_signing_identity_description',
     ],
     'ios_internal_pure_release_bot_arm64': [
-      'ios', 'pure_release_bot', 'arm64', 'ios_use_goma_rbe'
+      'ios', 'pure_release_bot', 'arm64', 'ios_use_goma_rbe',
+      'ios_code_signing_identity_description',
     ],
     'ios_debug_bot_x64': [
       'ios', 'debug_bot', 'x64', 'ios_use_goma_rbe'
@@ -506,6 +509,10 @@
       'gn_args': 'use_goma=true',
     },
 
+    'ios_code_signing_identity_description': {
+      'gn_args': 'ios_code_signing_identity_description="Apple Development"',
+    },
+
     'ios_use_goma_rbe': {
       'gn_args': 'ios_use_goma_rbe=true',
     },
diff --git a/chromium/third_party/webrtc/tools_webrtc/sancov/README b/chromium/third_party/webrtc/tools_webrtc/sancov/README
deleted file mode 100644
index c9b43e7ae0b..00000000000
--- a/chromium/third_party/webrtc/tools_webrtc/sancov/README
+++ /dev/null
@@ -1,9 +0,0 @@
-Blacklist for llvm's sancov
-
-See http://clang.llvm.org/docs/SanitizerCoverage.html .
-
-Example usage:
-> cd out/Debug
-> UBSAN_OPTIONS="coverage=1" ./peerconnection_unittests
-> sancov -html-report -blacklist ../../tools/sancov/blacklist.txt \
->   peerconnection_unittests peerconnection_unittests.123.sancov
diff --git a/chromium/third_party/webrtc/tools_webrtc/sancov/blacklist.txt b/chromium/third_party/webrtc/tools_webrtc/sancov/blacklist.txt
deleted file mode 100644
index 7043a18ef2c..00000000000
--- a/chromium/third_party/webrtc/tools_webrtc/sancov/blacklist.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-#############################################################################
-# sancov blacklist.
-# Please think twice before you add or remove these rules.
-
-#############################################################################
-# no coverage report for third party
-src:*/chromium/*
-src:*/third_party/*
-
-# OpenH264 triggers some errors that are out of our control.
-src:*/third_party/ffmpeg/libavcodec/*
-src:*/third_party/openh264/*
-
-#############################################################################
-# Ignore system libraries.
-src:*/usr/*
-
-#############################################################################
-# Ignore test source.
-src:*/test/*
-src:*_unittest.cc