BASELINE: Update Chromium to 85.0.4183.14085-based

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

1 files changed, 23 insertions, 2 deletions

diff --git a/chromium/components/content_settings/android/BUILD.gn b/chromium/components/content_settings/android/BUILD.gn
index 05939eea464..1c5229bc235 100644
--- a/chromium/components/content_settings/android/BUILD.gn
+++ b/chromium/components/content_settings/android/BUILD.gn
@@ -5,28 +5,43 @@
 import("//build/config/android/rules.gni")
 
 generate_jni("content_settings_jni_headers") {
-  sources = [ "java/src/org/chromium/components/content_settings/ContentSettingsFeatureList.java" ]
+  sources = [
+    "java/src/org/chromium/components/content_settings/ContentSettingsFeatureList.java",
+    "java/src/org/chromium/components/content_settings/CookieControlsBridge.java",
+  ]
 }
 
 android_library("java") {
   sources = [
     "java/src/org/chromium/components/content_settings/ContentSettingsFeatureList.java",
+    "java/src/org/chromium/components/content_settings/CookieControlsBridge.java",
     "java/src/org/chromium/components/content_settings/CookieControlsObserver.java",
   ]
   deps = [
     ":content_settings_enums_java",
     "//base:base_java",
     "//base:jni_java",
+    "//components/embedder_support/android:browser_context_java",
+    "//content/public/android:content_java",
   ]
   annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
 }
 
 source_set("android") {
-  sources = [ "content_settings_feature_list.cc" ]
+  sources = [
+    "content_settings_feature_list.cc",
+    "cookie_controls_bridge.cc",
+    "cookie_controls_bridge.h",
+  ]
   deps = [
     ":content_settings_jni_headers",
     "//base",
+    "//components/content_settings/browser/ui",
+    "//components/content_settings/core/browser",
     "//components/content_settings/core/common",
+    "//components/embedder_support/android:browser_context",
+    "//components/permissions",
+    "//content/public/browser",
   ]
 }
 
@@ -45,3 +60,9 @@ java_cpp_enum("content_settings_enums_javagen") {
   ]
   visibility = [ ":*" ]  # Depend on through :content_settings_enums_java
 }
+
+java_cpp_strings("java_pref_names_srcjar") {
+  sources = [ "//components/content_settings/core/common/pref_names.cc" ]
+
+  template = "java_templates/PrefNames.java.tmpl"
+}