BASELINE: Update Chromium to 85.0.4183.14085-based

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

1 files changed, 22 insertions, 5 deletions

diff --git a/chromium/chrome/browser/preferences/BUILD.gn b/chromium/chrome/browser/preferences/BUILD.gn
index 5491897b9e5..aec7e103a89 100644
--- a/chromium/chrome/browser/preferences/BUILD.gn
+++ b/chromium/chrome/browser/preferences/BUILD.gn
@@ -21,7 +21,26 @@ android_library("java") {
     "//base:jni_java",
   ]
   annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
-  srcjar_deps = [ ":java_enums_srcjar" ]
+  srcjar_deps = [ ":java_pref_names_srcjar" ]
+}
+
+# TODO(chouinard,estade): Consider breaking this target up into a different target for each pref file.
+java_cpp_strings("java_pref_names_srcjar") {
+  sources = [
+    "//chrome/common/pref_names.cc",
+    "//components/autofill/core/common/autofill_prefs.cc",
+    "//components/dom_distiller/core/pref_names.cc",
+    "//components/embedder_support/pref_names.cc",
+    "//components/feed/core/shared_prefs/pref_names.cc",
+    "//components/offline_pages/core/prefetch/prefetch_prefs.cc",
+    "//components/password_manager/core/common/password_manager_pref_names.cc",
+    "//components/payments/core/payment_prefs.cc",
+    "//components/safe_browsing/core/common/safe_browsing_prefs.cc",
+    "//components/signin/public/base/signin_pref_names.cc",
+    "//components/translate/core/browser/translate_pref_names.cc",
+  ]
+
+  template = "android/java_templates/Pref.java.tmpl"
 }
 
 generate_jni("jni_headers") {
@@ -31,10 +50,6 @@ generate_jni("jni_headers") {
   ]
 }
 
-java_cpp_enum("java_enums_srcjar") {
-  sources = [ "//chrome/browser/android/preferences/prefs.h" ]
-}
-
 java_library("preferences_junit_tests") {
   # Skip platform checks since Robolectric depends on requires_android targets.
   bypass_platform_checks = true
@@ -51,5 +66,7 @@ java_library("preferences_junit_tests") {
     "//base:base_java_test_support",
     "//base:base_junit_test_support",
     "//base/test:test_support_java",
+    "//third_party/junit:junit",
+    "//third_party/mockito:mockito_java",
   ]
 }