BASELINE: Update Chromium to 94.0.4606.111

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

1 files changed, 71 insertions, 2 deletions

diff --git a/chromium/chrome/browser/feed/android/BUILD.gn b/chromium/chrome/browser/feed/android/BUILD.gn
index c1917220761..32b0b0f9ec1 100644
--- a/chromium/chrome/browser/feed/android/BUILD.gn
+++ b/chromium/chrome/browser/feed/android/BUILD.gn
@@ -10,11 +10,13 @@ import("//chrome/browser/buildflags.gni")
 android_library("java") {
   sources = [
     "java/src/org/chromium/chrome/browser/feed/FeedImageFetchClient.java",
+    "java/src/org/chromium/chrome/browser/feed/FeedReliabilityLoggingBridge.java",
     "java/src/org/chromium/chrome/browser/feed/FeedServiceBridge.java",
     "java/src/org/chromium/chrome/browser/feed/FeedUma.java",
     "java/src/org/chromium/chrome/browser/feed/VideoPreviewsType.java",
     "java/src/org/chromium/chrome/browser/feed/settings/FeedAutoplaySettingsFragment.java",
     "java/src/org/chromium/chrome/browser/feed/settings/RadioButtonGroupVideoPreviewsPreference.java",
+    "java/src/org/chromium/chrome/browser/feed/webfeed/ShadowedClickableTextBubble.java",
     "java/src/org/chromium/chrome/browser/feed/webfeed/WebFeedBridge.java",
     "java/src/org/chromium/chrome/browser/feed/webfeed/WebFeedDialogContents.java",
     "java/src/org/chromium/chrome/browser/feed/webfeed/WebFeedDialogCoordinator.java",
@@ -37,12 +39,14 @@ android_library("java") {
     "//chrome/browser/tab:java",
     "//chrome/browser/ui/android/appmenu:java",
     "//chrome/browser/ui/messages/android:java",
+    "//chrome/browser/user_education:java",
     "//chrome/browser/util:java",
     "//chrome/browser/xsurface:java",
     "//components/browser_ui/settings/android:java",
     "//components/browser_ui/widget/android:java",
     "//components/favicon/android:java",
     "//components/feature_engagement:feature_engagement_java",
+    "//components/feed/core/proto:proto_java_v2",
     "//components/feed/core/v2:feedv2_core_java",
     "//components/prefs/android:java",
     "//components/url_formatter/android:url_formatter_java",
@@ -51,6 +55,7 @@ android_library("java") {
     "//third_party/androidx:androidx_annotation_annotation_java",
     "//third_party/androidx:androidx_appcompat_appcompat_resources_java",
     "//third_party/androidx:androidx_browser_browser_java",
+    "//third_party/androidx:androidx_core_core_java",
     "//third_party/androidx:androidx_preference_preference_java",
     "//ui/android:ui_no_recycler_view_java",
     "//url:gurl_java",
@@ -61,12 +66,19 @@ android_library("java") {
 
 android_resources("web_feed_java_resources") {
   sources = [
+    "java/res/color/chip_hairline_color.xml",
     "java/res/color/menu_footer_chip_background.xml",
+    "java/res/drawable-hdpi/follow_accelerator_shadow.9.png",
+    "java/res/drawable-mdpi/follow_accelerator_shadow.9.png",
+    "java/res/drawable-xhdpi/follow_accelerator_shadow.9.png",
+    "java/res/drawable-xxhdpi/follow_accelerator_shadow.9.png",
     "java/res/drawable/web_feed_post_follow_illustration.xml",
     "java/res/layout/feed_management_activity.xml",
     "java/res/layout/feed_management_list_item.xml",
     "java/res/layout/follow_management_activity.xml",
+    "java/res/layout/follow_management_empty_state.xml",
     "java/res/layout/follow_management_item.xml",
+    "java/res/layout/follow_management_loading_state.xml",
     "java/res/layout/radio_button_group_video_previews_preference.xml",
     "java/res/layout/web_feed_dialog.xml",
     "java/res/layout/web_feed_main_menu_item.xml",
@@ -87,6 +99,7 @@ android_resources("web_feed_java_resources") {
 generate_jni("jni_headers") {
   sources = [
     "java/src/org/chromium/chrome/browser/feed/FeedImageFetchClient.java",
+    "java/src/org/chromium/chrome/browser/feed/FeedReliabilityLoggingBridge.java",
     "java/src/org/chromium/chrome/browser/feed/FeedServiceBridge.java",
     "java/src/org/chromium/chrome/browser/feed/webfeed/WebFeedBridge.java",
   ]
@@ -95,17 +108,63 @@ generate_jni("jni_headers") {
 android_library("javatests") {
   testonly = true
 
+  sources = [ "java/src/org/chromium/chrome/browser/feed/settings/FeedAutoplaySettingsFragmentTest.java" ]
+
+  deps = [
+    ":java",
+    "//base:base_java",
+    "//base:base_java_test_support",
+    "//chrome/android:chrome_java",
+    "//chrome/browser/feature_engagement:java",
+    "//chrome/browser/flags:java",
+    "//chrome/browser/preferences:java",
+    "//chrome/browser/profiles/android:java",
+    "//chrome/browser/settings:test_support_java",
+    "//chrome/browser/tab:java",
+    "//chrome/browser/ui/android/appmenu:java",
+    "//chrome/browser/ui/messages/android:java",
+    "//chrome/test/android:chrome_java_test_support",
+    "//components/browser_ui/settings/android:java",
+    "//components/browser_ui/widget/android:java",
+    "//components/favicon/android:java",
+    "//components/feature_engagement:feature_engagement_java",
+    "//components/feed/core/v2:feedv2_core_java",
+    "//components/prefs/android:java",
+    "//components/url_formatter/android:url_formatter_java",
+    "//components/user_prefs/android:java",
+    "//content/public/test/android:content_java_test_support",
+    "//third_party/android_deps:espresso_java",
+    "//third_party/android_support_test_runner:runner_java",
+    "//third_party/androidx:androidx_preference_preference_java",
+    "//third_party/androidx:androidx_test_runner_java",
+    "//third_party/junit",
+    "//third_party/mockito:mockito_java",
+    "//ui/android:ui_java_test_support",
+    "//ui/android:ui_no_recycler_view_java",
+    "//url:gurl_java",
+  ]
+}
+
+android_library("junit") {
+  testonly = true
+
+  # Skip platform checks since Robolectric depends on requires_android targets.
+  bypass_platform_checks = true
+
   sources = [
-    "java/src/org/chromium/chrome/browser/feed/settings/FeedAutoplaySettingsFragmentTest.java",
     "java/src/org/chromium/chrome/browser/feed/webfeed/WebFeedFollowIntroControllerTest.java",
+    "java/src/org/chromium/chrome/browser/feed/webfeed/WebFeedFollowIntroViewTest.java",
     "java/src/org/chromium/chrome/browser/feed/webfeed/WebFeedMainMenuItemTest.java",
     "java/src/org/chromium/chrome/browser/feed/webfeed/WebFeedSnackbarControllerTest.java",
+    "junit/src/org/chromium/chrome/browser/feed/followmanagement/FollowManagementCoordinatorTest.java",
+    "junit/src/org/chromium/chrome/browser/feed/followmanagement/FollowManagementMediatorTest.java",
   ]
 
   deps = [
     ":java",
     "//base:base_java",
     "//base:base_java_test_support",
+    "//base:base_junit_test_support",
     "//chrome/android:chrome_java",
     "//chrome/browser/feature_engagement:java",
     "//chrome/browser/flags:java",
@@ -115,9 +174,11 @@ android_library("javatests") {
     "//chrome/browser/tab:java",
     "//chrome/browser/ui/android/appmenu:java",
     "//chrome/browser/ui/messages/android:java",
+    "//chrome/browser/user_education:java",
     "//chrome/test/android:chrome_java_test_support",
     "//components/browser_ui/settings/android:java",
     "//components/browser_ui/widget/android:java",
+    "//components/embedder_support/android:junit_test_support",
     "//components/favicon/android:java",
     "//components/feature_engagement:feature_engagement_java",
     "//components/feed/core/v2:feedv2_core_java",
@@ -126,13 +187,21 @@ android_library("javatests") {
     "//components/user_prefs/android:java",
     "//content/public/test/android:content_java_test_support",
     "//third_party/android_deps:espresso_java",
+    "//third_party/android_deps:robolectric_all_java",
     "//third_party/android_support_test_runner:runner_java",
-    "//third_party/androidx:androidx_preference_preference_java",
+    "//third_party/androidx:androidx_appcompat_appcompat_java",
+    "//third_party/androidx:androidx_appcompat_appcompat_resources_java",
+    "//third_party/androidx:androidx_lifecycle_lifecycle_common_java",
+    "//third_party/androidx:androidx_recyclerview_recyclerview_java",
+    "//third_party/androidx:androidx_test_core_java",
     "//third_party/androidx:androidx_test_runner_java",
     "//third_party/junit",
     "//third_party/mockito:mockito_java",
     "//ui/android:ui_java_test_support",
+    "//ui/android:ui_java_test_support",
     "//ui/android:ui_no_recycler_view_java",
+    "//ui/android:ui_recycler_view_java",
     "//url:gurl_java",
+    "//url:gurl_junit_test_support",
   ]
 }