BASELINE: Update Chromium to 85.0.4183.14085-based

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

3 files changed, 18 insertions, 2 deletions

diff --git a/chromium/third_party/espresso/BUILD.gn b/chromium/third_party/espresso/BUILD.gn
index b71d9c3b4cf..07fc37f06a2 100644
--- a/chromium/third_party/espresso/BUILD.gn
+++ b/chromium/third_party/espresso/BUILD.gn
@@ -5,6 +5,12 @@
 import("//build/config/android/rules.gni")
 
 java_group("espresso_all_java") {
+  # Targets should use //third_party/android_deps:espresso_java
+  # (migration is in progress).
+  visibility = [
+    ":*",
+    "//third_party/android_deps:*",
+  ]
   testonly = true
   deps = [
     ":espresso_contrib_java",
@@ -16,8 +22,11 @@ java_group("espresso_all_java") {
 }
 
 android_java_prebuilt("espresso_contrib_java") {
+  visibility = [ ":*" ]
+  enable_bytecode_checks = false
   testonly = true
   jar_path = "lib/espresso-contrib-release-no-dep.jar"
+  enable_bytecode_checks = false
   deps = [
     ":espresso_core_java",
     "//third_party/accessibility_test_framework:accessibility_test_framework_java",
@@ -29,7 +38,9 @@ android_java_prebuilt("espresso_contrib_java") {
 }
 
 android_java_prebuilt("espresso_core_java") {
+  visibility = [ ":*" ]
   testonly = true
+  enable_bytecode_checks = false
   jar_path = "lib/espresso-core-release-no-dep.jar"
   deps = [
     ":espresso_idling_java",
@@ -43,12 +54,16 @@ android_java_prebuilt("espresso_core_java") {
 }
 
 android_java_prebuilt("espresso_idling_java") {
+  visibility = [ ":*" ]
   testonly = true
+  enable_bytecode_checks = false
   jar_path = "lib/espresso-idling-resource-release-no-dep.jar"
 }
 
 android_java_prebuilt("espresso_intents_java") {
+  visibility = [ ":*" ]
   testonly = true
+  enable_bytecode_checks = false
   jar_path = "lib/espresso-intents-release-no-dep.jar"
   deps = [
     ":espresso_core_java",
@@ -60,7 +75,7 @@ android_java_prebuilt("espresso_intents_java") {
 }
 
 android_java_prebuilt("espresso_web_java") {
-  # Uses org/ccil/cowan/tagsoup/Parser which isn't in third_party.
+  visibility = [ ":*" ]
   enable_bytecode_checks = false
   testonly = true
   jar_path = "lib/espresso-web-release-no-dep.jar"
diff --git a/chromium/third_party/espresso/README.chromium b/chromium/third_party/espresso/README.chromium
index 2340dd1d40c..8b4d46243bd 100644
--- a/chromium/third_party/espresso/README.chromium
+++ b/chromium/third_party/espresso/README.chromium
@@ -18,3 +18,4 @@ Local Modifications:
     in android/support/test/espresso/web/action/JavascriptEvaluation.java for Guava 20.0
     compatibility
   - Change all Guava dependencies in Espresso build.gradle files from 18.0 to 20.0
+  - Jetified .jar files.
diff --git a/chromium/third_party/espresso/cipd.yaml b/chromium/third_party/espresso/cipd.yaml
index 7e2053213ed..013e24a544b 100644
--- a/chromium/third_party/espresso/cipd.yaml
+++ b/chromium/third_party/espresso/cipd.yaml
@@ -3,7 +3,7 @@
 # found in the LICENSE file.
 
 # To create CIPD package run the following command.
-# cipd create --pkg-def cipd.yaml -tag version:$(cat version.txt)
+# cipd create --pkg-def cipd.yaml
 package: chromium/third_party/espresso
 description: espresso Java library
 data: