BASELINE: Update Chromium to 85.0.4183.14085-based

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

1 files changed, 84 insertions, 6 deletions

diff --git a/chromium/weblayer/browser/java/BUILD.gn b/chromium/weblayer/browser/java/BUILD.gn
index e5a00fb6c61..38cdda128ce 100644
--- a/chromium/weblayer/browser/java/BUILD.gn
+++ b/chromium/weblayer/browser/java/BUILD.gn
@@ -9,20 +9,33 @@ import("//weblayer/variables.gni")
 
 android_resources("weblayer_resources") {
   sources = [
+    "res/drawable/weblayer_infobar_wrapper_bg.xml",
+    "res/drawable/weblayer_tab_indicator.xml",
     "res/layout/site_settings_layout.xml",
+    "res/layout/weblayer_infobar_translate_compact_content.xml",
+    "res/layout/weblayer_infobar_translate_tab_content.xml",
+    "res/layout/weblayer_translate_menu_item.xml",
+    "res/layout/weblayer_translate_menu_item_checked.xml",
     "res/layout/weblayer_url_bar.xml",
+    "res/values/colors.xml",
     "res/values/dimens.xml",
     "res/values/styles.xml",
   ]
   custom_package = "org.chromium.weblayer_private"
   deps = [
     ":weblayer_strings_grd",
+    "//components/blocked_content/android:java_resources",
+    "//components/browser_ui/http_auth/android:java_resources",
+    "//components/browser_ui/media/android:java_resources",
     "//components/browser_ui/settings/android:java_resources",
     "//components/browser_ui/site_settings/android:java_resources",
     "//components/browser_ui/strings/android:browser_ui_strings_grd",
     "//components/browser_ui/styles/android:java_resources",
+    "//components/infobars/android:java_resources",
     "//components/page_info/android:java_resources",
     "//components/permissions/android:java_resources",
+    "//components/translate/content/android:java_resources",
+    "//third_party/android_deps:com_google_android_material_material_java",
     "//weblayer:components_java_strings",
   ]
 }
@@ -35,6 +48,7 @@ java_cpp_template("resource_id_javagen") {
   sources = [ "ResourceId.template" ]
   package_path = "org/chromium/weblayer_private/resources"
   inputs = [
+    "//components/resources/android/blocked_content_resource_id.h",
     "//components/resources/android/page_info_resource_id.h",
     "//components/resources/android/permissions_resource_id.h",
   ]
@@ -51,6 +65,8 @@ java_strings_grd("weblayer_strings_grd") {
 java_cpp_enum("generated_enums") {
   sources = [
     "//weblayer/browser/controls_visibility_reason.h",
+    "//weblayer/browser/infobar_android.h",
+    "//weblayer/browser/translate_utils.h",
     "//weblayer/public/download.h",
     "//weblayer/public/navigation.h",
     "//weblayer/public/new_tab_delegate.h",
@@ -60,7 +76,6 @@ java_cpp_enum("generated_enums") {
 
 android_library("java") {
   sources = [
-    "org/chromium/weblayer_private/AccessibilityUtil.java",
     "org/chromium/weblayer_private/ActionModeCallback.java",
     "org/chromium/weblayer_private/AutocompleteSchemeClassifierImpl.java",
     "org/chromium/weblayer_private/AutofillView.java",
@@ -69,7 +84,7 @@ android_library("java") {
     "org/chromium/weblayer_private/BrowserImpl.java",
     "org/chromium/weblayer_private/BrowserViewController.java",
     "org/chromium/weblayer_private/ChildProcessServiceImpl.java",
-    "org/chromium/weblayer_private/ContentView.java",
+    "org/chromium/weblayer_private/ConfirmInfoBar.java",
     "org/chromium/weblayer_private/ContentViewRenderView.java",
     "org/chromium/weblayer_private/CookieManagerImpl.java",
     "org/chromium/weblayer_private/CrashReporterControllerImpl.java",
@@ -80,9 +95,19 @@ android_library("java") {
     "org/chromium/weblayer_private/FragmentAndroidPermissionDelegate.java",
     "org/chromium/weblayer_private/FragmentWindowAndroid.java",
     "org/chromium/weblayer_private/FullscreenCallbackProxy.java",
+    "org/chromium/weblayer_private/InfoBar.java",
+    "org/chromium/weblayer_private/InfoBarCompactLayout.java",
+    "org/chromium/weblayer_private/InfoBarContainer.java",
+    "org/chromium/weblayer_private/InfoBarContainerLayout.java",
+    "org/chromium/weblayer_private/InfoBarContainerView.java",
+    "org/chromium/weblayer_private/InfoBarUiItem.java",
+    "org/chromium/weblayer_private/InfoBarWrapper.java",
+    "org/chromium/weblayer_private/IntentUtils.java",
     "org/chromium/weblayer_private/InterceptNavigationDelegateClientImpl.java",
     "org/chromium/weblayer_private/LocaleChangedBroadcastReceiver.java",
+    "org/chromium/weblayer_private/MediaSessionManager.java",
     "org/chromium/weblayer_private/MediaStreamManager.java",
+    "org/chromium/weblayer_private/MojoInterfaceRegistrar.java",
     "org/chromium/weblayer_private/NavigationControllerImpl.java",
     "org/chromium/weblayer_private/NavigationImpl.java",
     "org/chromium/weblayer_private/NewTabCallbackProxy.java",
@@ -91,8 +116,15 @@ android_library("java") {
     "org/chromium/weblayer_private/ProfileManager.java",
     "org/chromium/weblayer_private/RemoteFragmentImpl.java",
     "org/chromium/weblayer_private/SiteSettingsFragmentImpl.java",
+    "org/chromium/weblayer_private/SwipableOverlayView.java",
     "org/chromium/weblayer_private/TabCallbackProxy.java",
     "org/chromium/weblayer_private/TabImpl.java",
+    "org/chromium/weblayer_private/TranslateCompactInfoBar.java",
+    "org/chromium/weblayer_private/TranslateMenu.java",
+    "org/chromium/weblayer_private/TranslateMenuHelper.java",
+    "org/chromium/weblayer_private/TranslateOptions.java",
+    "org/chromium/weblayer_private/TranslateTabContent.java",
+    "org/chromium/weblayer_private/TranslateTabLayout.java",
     "org/chromium/weblayer_private/UrlBarControllerImpl.java",
     "org/chromium/weblayer_private/WebContentsGestureStateTracker.java",
     "org/chromium/weblayer_private/WebLayerAccessibilityUtil.java",
@@ -103,6 +135,8 @@ android_library("java") {
     "org/chromium/weblayer_private/WebLayerNotificationChannels.java",
     "org/chromium/weblayer_private/WebLayerSiteSettingsClient.java",
     "org/chromium/weblayer_private/WebLayerTabModalPresenter.java",
+    "org/chromium/weblayer_private/WebMessageReplyProxyImpl.java",
+    "org/chromium/weblayer_private/WebShareServiceFactory.java",
     "org/chromium/weblayer_private/WebViewCompatibilityHelperImpl.java",
     "org/chromium/weblayer_private/metrics/MetricsServiceClient.java",
     "org/chromium/weblayer_private/metrics/UmaUtils.java",
@@ -116,26 +150,34 @@ android_library("java") {
     ":weblayer_resources",
     "//base:base_java",
     "//base:jni_java",
-    "//components/autofill/android:provider_java",
+    "//components/autofill/android/provider:java",
+    "//components/browser_ui/client_certificate/android:java",
+    "//components/browser_ui/http_auth/android:java",
+    "//components/browser_ui/media/android:java",
     "//components/browser_ui/modaldialog/android:java",
     "//components/browser_ui/notifications/android:java",
     "//components/browser_ui/settings/android:java",
+    "//components/browser_ui/share/android:java",
     "//components/browser_ui/site_settings/android:java",
     "//components/browser_ui/styles/android:java",
-    "//components/browser_ui/styles/android:java_resources",
     "//components/browser_ui/util/android:java",
+    "//components/browser_ui/webshare/android:java",
+    "//components/browser_ui/widget/android:java",
     "//components/content_settings/android:java",
     "//components/crash/android:handler_java",
     "//components/crash/android:java",
     "//components/download/internal/common:internal_java",
     "//components/embedder_support/android:application_java",
     "//components/embedder_support/android:browser_context_java",
+    "//components/embedder_support/android:content_view_java",
     "//components/embedder_support/android:context_menu_java",
     "//components/embedder_support/android:util_java",
     "//components/embedder_support/android:web_contents_delegate_java",
     "//components/embedder_support/android/metrics:java",
     "//components/external_intents/android:java",
     "//components/find_in_page/android:java",
+    "//components/infobars/android:java",
+    "//components/infobars/core:infobar_enums_java",
     "//components/javascript_dialogs/android:java",
     "//components/location/android:settings_java",
     "//components/metrics:metrics_java",
@@ -150,11 +192,22 @@ android_library("java") {
     "//components/url_formatter/android:url_formatter_java",
     "//components/variations/android:variations_java",
     "//components/version_info/android:version_constants_java",
+    "//components/webapk/android/libs/client:java",
+    "//components/webapk/android/libs/common:java",
     "//components/webrtc/android:java",
     "//content/public/android:content_java",
+    "//mojo/public/java:bindings_java",
     "//net/android:net_java",
+    "//services/network/public/mojom:cookies_mojom_java",
     "//services/network/public/mojom:mojom_java",
+    "//services/service_manager/public/java:service_manager_java",
+    "//third_party/android_deps:androidx_appcompat_appcompat_java",
+    "//third_party/android_deps:androidx_appcompat_appcompat_resources_java",
     "//third_party/android_deps:androidx_core_core_java",
+    "//third_party/android_deps:androidx_fragment_fragment_java",
+    "//third_party/android_deps:androidx_preference_preference_java",
+    "//third_party/android_deps:com_google_android_material_material_java",
+    "//third_party/blink/public/mojom:android_mojo_bindings_java",
     "//ui/android:ui_full_java",
     "//ui/android:ui_java",
     "//url:gurl_java",
@@ -188,9 +241,16 @@ android_resources("weblayer_test_resources") {
 
 android_library("test_java") {
   testonly = true
-  sources = [ "org/chromium/weblayer_private/test/TestWebLayerImpl.java" ]
+  sources = [
+    "org/chromium/weblayer_private/test/TestInfoBar.java",
+    "org/chromium/weblayer_private/test/TestWebLayerImpl.java",
+  ]
   deps = [
+    ":interfaces_java",
+    ":java",
     ":weblayer_test_resources",
+    "//base:jni_java",
+    "//components/location/android:location_java",
     "//components/permissions/android:java",
     "//content/public/test/android:content_java_test_support",
     "//net/android:net_java",
@@ -199,6 +259,15 @@ android_library("test_java") {
     "//ui/android:ui_full_java",
   ]
   srcjar_deps = [ ":test_aidl" ]
+  annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
+}
+
+generate_jni("test_jni") {
+  testonly = true
+  sources = [
+    "org/chromium/weblayer_private/test/TestInfoBar.java",
+    "org/chromium/weblayer_private/test/TestWebLayerImpl.java",
+  ]
 }
 
 generate_jni("jni") {
@@ -206,25 +275,30 @@ generate_jni("jni") {
     "org/chromium/weblayer_private/AutocompleteSchemeClassifierImpl.java",
     "org/chromium/weblayer_private/BrowserControlsContainerView.java",
     "org/chromium/weblayer_private/BrowserImpl.java",
+    "org/chromium/weblayer_private/ConfirmInfoBar.java",
     "org/chromium/weblayer_private/ContentViewRenderView.java",
     "org/chromium/weblayer_private/CookieManagerImpl.java",
     "org/chromium/weblayer_private/DownloadCallbackProxy.java",
     "org/chromium/weblayer_private/DownloadImpl.java",
     "org/chromium/weblayer_private/ErrorPageCallbackProxy.java",
     "org/chromium/weblayer_private/FullscreenCallbackProxy.java",
+    "org/chromium/weblayer_private/InfoBar.java",
+    "org/chromium/weblayer_private/InfoBarContainer.java",
     "org/chromium/weblayer_private/LocaleChangedBroadcastReceiver.java",
     "org/chromium/weblayer_private/MediaStreamManager.java",
+    "org/chromium/weblayer_private/MojoInterfaceRegistrar.java",
     "org/chromium/weblayer_private/NavigationControllerImpl.java",
     "org/chromium/weblayer_private/NavigationImpl.java",
     "org/chromium/weblayer_private/NewTabCallbackProxy.java",
     "org/chromium/weblayer_private/ProfileImpl.java",
     "org/chromium/weblayer_private/TabCallbackProxy.java",
     "org/chromium/weblayer_private/TabImpl.java",
+    "org/chromium/weblayer_private/TranslateCompactInfoBar.java",
     "org/chromium/weblayer_private/UrlBarControllerImpl.java",
     "org/chromium/weblayer_private/WebLayerExceptionFilter.java",
     "org/chromium/weblayer_private/WebLayerFactoryImpl.java",
     "org/chromium/weblayer_private/WebLayerImpl.java",
-    "org/chromium/weblayer_private/WebLayerSiteSettingsClient.java",
+    "org/chromium/weblayer_private/WebMessageReplyProxyImpl.java",
     "org/chromium/weblayer_private/WebViewCompatibilityHelperImpl.java",
     "org/chromium/weblayer_private/metrics/MetricsServiceClient.java",
     "org/chromium/weblayer_private/metrics/UmaUtils.java",
@@ -246,11 +320,13 @@ android_library("interfaces_java") {
     "org/chromium/weblayer_private/interfaces/NavigationState.java",
     "org/chromium/weblayer_private/interfaces/NewTabType.java",
     "org/chromium/weblayer_private/interfaces/ObjectWrapper.java",
+    "org/chromium/weblayer_private/interfaces/ScrollNotificationType.java",
     "org/chromium/weblayer_private/interfaces/SettingType.java",
     "org/chromium/weblayer_private/interfaces/SiteSettingsFragmentArgs.java",
     "org/chromium/weblayer_private/interfaces/SiteSettingsIntentHelper.java",
     "org/chromium/weblayer_private/interfaces/StrictModeWorkaround.java",
     "org/chromium/weblayer_private/interfaces/UrlBarOptionsKeys.java",
+    "org/chromium/weblayer_private/interfaces/WebLayerVersionConstants.java",
   ]
 
   deps = [ "//third_party/android_deps:androidx_annotation_annotation_java" ]
@@ -316,6 +392,8 @@ android_aidl("aidl") {
     "org/chromium/weblayer_private/interfaces/IWebLayer.aidl",
     "org/chromium/weblayer_private/interfaces/IWebLayerClient.aidl",
     "org/chromium/weblayer_private/interfaces/IWebLayerFactory.aidl",
+    "org/chromium/weblayer_private/interfaces/IWebMessageCallbackClient.aidl",
+    "org/chromium/weblayer_private/interfaces/IWebMessageReplyProxy.aidl",
   ]
 }