Adaptations for Chromium 83

Change-Id: I63ed851426b18623d549ceaf87f1b6eeec527966
Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io>

2 files changed, 13 insertions, 8 deletions

diff --git a/tools/scripts/take_snapshot.py b/tools/scripts/take_snapshot.py
index 6edacaca6..57906378a 100755
--- a/tools/scripts/take_snapshot.py
+++ b/tools/scripts/take_snapshot.py
@@ -109,7 +109,7 @@ def isInChromiumBlacklist(file_path):
             or file_path.startswith('components/proximity_auth/')
             or (file_path.startswith('components/resources/terms/') and not file_path.endswith('terms_chromium.html'))
             or file_path.startswith('components/rlz/')
-            or file_path.startswith('components/sync/') and not file_path.endswith('ordinal.h')
+            or (file_path.startswith('components/sync/') and not file_path.endswith('ordinal.h'))
             or file_path.startswith('components/test/')
             or file_path.startswith('components/test_runner/')
             or file_path.startswith('components/translate/')
@@ -192,6 +192,7 @@ def isInChromiumBlacklist(file_path):
             or file_path.startswith('third_party/sfntly/src/java')
             or file_path.startswith('third_party/skia/docs/')
             or file_path.startswith('third_party/skia/infra')
+            or file_path.startswith('third_party/skia/site/dev/tools/calendar.mskp')
             or file_path.startswith('third_party/sqlite/sqlite-src-')
             or file_path.startswith('third_party/speech-dispatcher')
             or file_path.startswith('third_party/spirv-cross/spirv-cross/reference/')
@@ -231,17 +232,21 @@ def isInChromiumBlacklist(file_path):
           or ('/test/' in file_path and
             not '/webrtc/' in file_path and
             not file_path.startswith('net/test/') and
-            not file_path.endswith('mock_chrome_application_mac.h') and
-            not file_path.endswith('test_mock_time_task_runner.h') and
+            not file_path.endswith('test_hook.h') and
             not file_path.endswith('perftimer.h') and
             not file_path.endswith('test-torque.tq') and
-            not file_path.endswith('fonts.conf') and
             not 'ozone' in file_path and
             not 'clang_coverage' in file_path and
             not 'crypto/test/trampoline' in file_path and
-            not 'fontconfig_util_linux' in file_path and
             not 'core/mojo/test/' in file_path and
-            not file_path.startswith('extensions/browser/'))
+            not file_path.startswith('extensions/browser/') and
+            (not file_path.startswith('base/test/') or
+              file_path.startswith('base/test/android/') or
+              file_path.startswith('base/test/data/')
+              file_path.startswith('base/test/ios/') or
+              file_path.startswith('base/test/launcher/') or
+              file_path.startswith('base/test/library_loader/') or
+              file_path.startswith('base/test/metrics/')))
         ))):
             return True
     return False
diff --git a/tools/scripts/version_resolver.py b/tools/scripts/version_resolver.py
index 7bc88de4c..32c8be74c 100644
--- a/tools/scripts/version_resolver.py
+++ b/tools/scripts/version_resolver.py
@@ -38,8 +38,8 @@ import json
 import urllib2
 import git_submodule as GitSubmodule
 
-chromium_version = '81.0.4044.152'
-chromium_branch = '4044'
+chromium_version = '83.0.4103.122'
+chromium_branch = '4103'
 ninja_version = 'v1.8.2'
 
 json_url = 'http://omahaproxy.appspot.com/all.json'