BASELINE: Update Chromium to 92.0.4515.166

Change-Id: I42a050486714e9e54fc271f2a8939223a02ae364

2 files changed, 68 insertions, 7 deletions

diff --git a/chromium/chrome/browser/feed/android/BUILD.gn b/chromium/chrome/browser/feed/android/BUILD.gn
index fa4517330f1..c1917220761 100644
--- a/chromium/chrome/browser/feed/android/BUILD.gn
+++ b/chromium/chrome/browser/feed/android/BUILD.gn
@@ -13,14 +13,14 @@ android_library("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/feedmanagement/FeedManagementCoordinator.java",
-    "java/src/org/chromium/chrome/browser/feed/feedmanagement/FeedManagementItemProperties.java",
-    "java/src/org/chromium/chrome/browser/feed/feedmanagement/FeedManagementItemView.java",
-    "java/src/org/chromium/chrome/browser/feed/feedmanagement/FeedManagementItemViewBinder.java",
-    "java/src/org/chromium/chrome/browser/feed/feedmanagement/FeedManagementMediator.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/WebFeedBridge.java",
+    "java/src/org/chromium/chrome/browser/feed/webfeed/WebFeedDialogContents.java",
+    "java/src/org/chromium/chrome/browser/feed/webfeed/WebFeedDialogCoordinator.java",
+    "java/src/org/chromium/chrome/browser/feed/webfeed/WebFeedDialogMediator.java",
+    "java/src/org/chromium/chrome/browser/feed/webfeed/WebFeedDialogProperties.java",
+    "java/src/org/chromium/chrome/browser/feed/webfeed/WebFeedDialogViewBinder.java",
     "java/src/org/chromium/chrome/browser/feed/webfeed/WebFeedFollowIntroController.java",
     "java/src/org/chromium/chrome/browser/feed/webfeed/WebFeedFollowIntroView.java",
     "java/src/org/chromium/chrome/browser/feed/webfeed/WebFeedMainMenuItem.java",
@@ -29,6 +29,10 @@ android_library("java") {
   deps = [
     ":web_feed_java_resources",
     "//base:base_java",
+    "//chrome/browser/browser_controls/android:java",
+    "//chrome/browser/feature_engagement:java",
+    "//chrome/browser/flags:java",
+    "//chrome/browser/preferences:java",
     "//chrome/browser/profiles/android:java",
     "//chrome/browser/tab:java",
     "//chrome/browser/ui/android/appmenu:java",
@@ -38,8 +42,11 @@ android_library("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/v2:feedv2_core_java",
+    "//components/prefs/android:java",
     "//components/url_formatter/android:url_formatter_java",
+    "//components/user_prefs/android:java",
     "//content/public/android:content_main_dex_java",
     "//third_party/androidx:androidx_annotation_annotation_java",
     "//third_party/androidx:androidx_appcompat_appcompat_resources_java",
@@ -54,10 +61,17 @@ android_library("java") {
 
 android_resources("web_feed_java_resources") {
   sources = [
+    "java/res/color/menu_footer_chip_background.xml",
+    "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_item.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",
+    "java/res/values-night/colors.xml",
+    "java/res/values/colors.xml",
     "java/res/values/dimens.xml",
     "java/res/values/styles.xml",
     "java/res/xml/feed_autoplay_preferences.xml",
@@ -83,8 +97,9 @@ android_library("javatests") {
 
   sources = [
     "java/src/org/chromium/chrome/browser/feed/settings/FeedAutoplaySettingsFragmentTest.java",
-    "javatests/src/org/chromium/chrome/browser/feed/webfeed/WebFeedMainMenuItemTest.java",
-    "javatests/src/org/chromium/chrome/browser/feed/webfeed/WebFeedSnackbarControllerTest.java",
+    "java/src/org/chromium/chrome/browser/feed/webfeed/WebFeedFollowIntroControllerTest.java",
+    "java/src/org/chromium/chrome/browser/feed/webfeed/WebFeedMainMenuItemTest.java",
+    "java/src/org/chromium/chrome/browser/feed/webfeed/WebFeedSnackbarControllerTest.java",
   ]
 
   deps = [
@@ -92,15 +107,19 @@ android_library("javatests") {
     "//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",
diff --git a/chromium/chrome/browser/feed/android/web_feed_java_sources.gni b/chromium/chrome/browser/feed/android/web_feed_java_sources.gni
new file mode 100644
index 00000000000..80370cebb64
--- /dev/null
+++ b/chromium/chrome/browser/feed/android/web_feed_java_sources.gni
@@ -0,0 +1,42 @@
+# Copyright 2021 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+import("//components/feed/features.gni")
+
+web_feed_deps = [
+  "//base:base_java",
+  "//chrome/browser/feed/android:web_feed_java_resources",
+  "//chrome/browser/profiles/android:java",
+  "//chrome/browser/tab:java",
+  "//chrome/browser/ui/android/appmenu:java",
+  "//chrome/browser/ui/messages/android: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/feed/core/v2:feedv2_core_java",
+  "//components/url_formatter/android:url_formatter_java",
+  "//content/public/android:content_main_dex_java",
+  "//third_party/androidx:androidx_annotation_annotation_java",
+  "//third_party/androidx:androidx_appcompat_appcompat_resources_java",
+  "//third_party/androidx:androidx_preference_preference_java",
+  "//ui/android:ui_no_recycler_view_java",
+  "//url:gurl_java",
+]
+
+web_feed_java_sources = [
+  "//chrome/browser/feed/android/java/src/org/chromium/chrome/browser/feed/feedmanagement/FeedManagementCoordinator.java",
+  "//chrome/browser/feed/android/java/src/org/chromium/chrome/browser/feed/feedmanagement/FeedManagementItemProperties.java",
+  "//chrome/browser/feed/android/java/src/org/chromium/chrome/browser/feed/feedmanagement/FeedManagementItemView.java",
+  "//chrome/browser/feed/android/java/src/org/chromium/chrome/browser/feed/feedmanagement/FeedManagementItemViewBinder.java",
+  "//chrome/browser/feed/android/java/src/org/chromium/chrome/browser/feed/feedmanagement/FeedManagementMediator.java",
+  "//chrome/browser/feed/android/java/src/org/chromium/chrome/browser/feed/followmanagement/FollowManagementCoordinator.java",
+  "//chrome/browser/feed/android/java/src/org/chromium/chrome/browser/feed/followmanagement/FollowManagementItemProperties.java",
+  "//chrome/browser/feed/android/java/src/org/chromium/chrome/browser/feed/followmanagement/FollowManagementItemView.java",
+  "//chrome/browser/feed/android/java/src/org/chromium/chrome/browser/feed/followmanagement/FollowManagementItemViewBinder.java",
+  "//chrome/browser/feed/android/java/src/org/chromium/chrome/browser/feed/followmanagement/FollowManagementMediator.java",
+]
+
+web_feed_srcjar_deps = []