BASELINE: Update Chromium to 96.0.4664.181

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

7 files changed, 53 insertions, 40 deletions

diff --git a/chromium/chrome/android/features/autofill_assistant/BUILD.gn b/chromium/chrome/android/features/autofill_assistant/BUILD.gn
index efa009a88e8..eba85c93fdb 100644
--- a/chromium/chrome/android/features/autofill_assistant/BUILD.gn
+++ b/chromium/chrome/android/features/autofill_assistant/BUILD.gn
@@ -318,11 +318,14 @@ android_library("test_java") {
     "javatests/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantTestRule.java",
     "javatests/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantTextUtilsTest.java",
     "javatests/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantTriggerScriptIntegrationTest.java",
+    "javatests/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantTtsIntegrationTest.java",
     "javatests/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantUiTest.java",
     "javatests/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantUiTestUtil.java",
+    "javatests/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantUpdateClientSettingsIntegrationTest.java",
     "javatests/src/org/chromium/chrome/browser/autofill_assistant/BottomSheetOnboardingCoordinatorTest.java",
     "javatests/src/org/chromium/chrome/browser/autofill_assistant/DirectActionsIntegrationTest.java",
-    "javatests/src/org/chromium/chrome/browser/autofill_assistant/InChromeTriggeringTest.java",
+    "javatests/src/org/chromium/chrome/browser/autofill_assistant/InCctTriggeringFromGsaTest.java",
+    "javatests/src/org/chromium/chrome/browser/autofill_assistant/InCctTriggeringFromNonGsaTest.java",
     "javatests/src/org/chromium/chrome/browser/autofill_assistant/MiniActionTestUtil.java",
     "javatests/src/org/chromium/chrome/browser/autofill_assistant/PasswordChangeFixtureParameters.java",
     "javatests/src/org/chromium/chrome/browser/autofill_assistant/PasswordChangeFixtureTest.java",
@@ -451,6 +454,7 @@ android_resources("java_resources") {
   deps = [
     ":java_strings_grd",
     "//chrome/android:chrome_app_java_resources",
+    "//components/browser_ui/styles/android:java_resources",
   ]
 }
 
diff --git a/chromium/chrome/android/features/cablev2_authenticator/BUILD.gn b/chromium/chrome/android/features/cablev2_authenticator/BUILD.gn
index e44113ad603..c7613ff9cbd 100644
--- a/chromium/chrome/android/features/cablev2_authenticator/BUILD.gn
+++ b/chromium/chrome/android/features/cablev2_authenticator/BUILD.gn
@@ -10,8 +10,6 @@ android_library("java") {
     "java/src/org/chromium/chrome/browser/webauth/authenticator/BLEAdvert.java",
     "java/src/org/chromium/chrome/browser/webauth/authenticator/CableAuthenticator.java",
     "java/src/org/chromium/chrome/browser/webauth/authenticator/CableAuthenticatorUI.java",
-    "java/src/org/chromium/chrome/browser/webauth/authenticator/CameraView.java",
-    "java/src/org/chromium/chrome/browser/webauth/authenticator/QRScanDialog.java",
     "java/src/org/chromium/chrome/browser/webauth/authenticator/USBHandler.java",
   ]
 
@@ -23,6 +21,7 @@ android_library("java") {
     "$google_play_services_package:google_play_services_vision_common_java",
     "$google_play_services_package:google_play_services_vision_java",
     "//base:base_java",
+    "//chrome/browser/webauthn/android:java_resources",
     "//content/public/android:content_java",
     "//third_party/android_deps:android_support_v7_appcompat_java",
     "//third_party/androidx:androidx_annotation_annotation_java",
@@ -44,43 +43,14 @@ generate_jni("jni_headers") {
 
 android_resources("java_resources") {
   sources = [
-    "java/res/anim/circle_loader_animation_interpolator_0.xml",
-    "java/res/anim/circle_loader_animation_interpolator_1.xml",
-    "java/res/anim/circle_loader_animation_interpolator_2.xml",
-    "java/res/anim/circle_loader_animation_interpolator_3.xml",
-    "java/res/anim/circle_loader_animation_interpolator_4.xml",
-    "java/res/anim/circle_loader_animation_interpolator_5.xml",
-    "java/res/anim/circle_loader_animation_interpolator_6.xml",
-    "java/res/anim/circle_loader_animation_interpolator_7.xml",
-    "java/res/anim/circle_loader_animation_interpolator_8.xml",
-    "java/res/anim/circle_loader_circleblue_animation.xml",
-    "java/res/anim/circle_loader_circlegreen_animation.xml",
-    "java/res/anim/circle_loader_circlered_animation.xml",
-    "java/res/anim/circle_loader_circleyellow_animation.xml",
-    "java/res/anim/circle_loader_ellipse_path_2_animation.xml",
-    "java/res/anim/circle_loader_ellipse_path_3_animation.xml",
-    "java/res/anim/circle_loader_ellipse_path_4_animation.xml",
-    "java/res/anim/circle_loader_ellipse_path_5_animation.xml",
     "java/res/drawable-night/ble.xml",
-    "java/res/drawable-night/error_icon.xml",
     "java/res/drawable/ble.xml",
-    "java/res/drawable/circle_loader.xml",
-    "java/res/drawable/circle_loader_animation.xml",
-    "java/res/drawable/error_icon.xml",
-    "java/res/drawable/header.xml",
-    "java/res/drawable/ic_lock_googblue_48dp.xml",
     "java/res/drawable/usb_conn_disconnect.xml",
     "java/res/layout-sw600dp/cablev2_ble_enable.xml",
-    "java/res/layout-sw600dp/cablev2_error.xml",
-    "java/res/layout-sw600dp/cablev2_serverlink.xml",
     "java/res/layout/cablev2_ble_enable.xml",
-    "java/res/layout/cablev2_error.xml",
-    "java/res/layout/cablev2_qr_dialog.xml",
-    "java/res/layout/cablev2_qr_scan.xml",
-    "java/res/layout/cablev2_serverlink.xml",
+    "java/res/layout/cablev2_qr.xml",
     "java/res/layout/cablev2_usb_attached.xml",
     "java/res/values/attrs.xml",
-    "java/res/values/styles.xml",
   ]
   deps = [ "//chrome/android:chrome_app_java_resources" ]
 }
diff --git a/chromium/chrome/android/features/keyboard_accessory/internal/BUILD.gn b/chromium/chrome/android/features/keyboard_accessory/internal/BUILD.gn
index c587025d8e5..f92f90bdf32 100644
--- a/chromium/chrome/android/features/keyboard_accessory/internal/BUILD.gn
+++ b/chromium/chrome/android/features/keyboard_accessory/internal/BUILD.gn
@@ -56,7 +56,6 @@ android_library("internal_java") {
     "java/src/org/chromium/chrome/browser/keyboard_accessory/all_passwords_bottom_sheet/AllPasswordsBottomSheetBridge.java",
     "java/src/org/chromium/chrome/browser/keyboard_accessory/all_passwords_bottom_sheet/AllPasswordsBottomSheetCoordinator.java",
     "java/src/org/chromium/chrome/browser/keyboard_accessory/all_passwords_bottom_sheet/AllPasswordsBottomSheetMediator.java",
-    "java/src/org/chromium/chrome/browser/keyboard_accessory/all_passwords_bottom_sheet/AllPasswordsBottomSheetMetricsRecorder.java",
     "java/src/org/chromium/chrome/browser/keyboard_accessory/all_passwords_bottom_sheet/AllPasswordsBottomSheetProperties.java",
     "java/src/org/chromium/chrome/browser/keyboard_accessory/all_passwords_bottom_sheet/AllPasswordsBottomSheetView.java",
     "java/src/org/chromium/chrome/browser/keyboard_accessory/all_passwords_bottom_sheet/AllPasswordsBottomSheetViewBinder.java",
@@ -100,6 +99,7 @@ android_library("internal_java") {
     "java/src/org/chromium/chrome/browser/keyboard_accessory/sheet_tabs/PasswordAccessorySheetMediator.java",
     "java/src/org/chromium/chrome/browser/keyboard_accessory/sheet_tabs/PasswordAccessorySheetModernViewBinder.java",
     "java/src/org/chromium/chrome/browser/keyboard_accessory/sheet_tabs/PasswordAccessorySheetViewBinder.java",
+    "java/src/org/chromium/chrome/browser/keyboard_accessory/sheet_tabs/PromoCodeAccessoryInfoView.java",
     "java/src/org/chromium/chrome/browser/keyboard_accessory/tab_layout_component/KeyboardAccessoryTabLayoutCoordinator.java",
     "java/src/org/chromium/chrome/browser/keyboard_accessory/tab_layout_component/KeyboardAccessoryTabLayoutMediator.java",
     "java/src/org/chromium/chrome/browser/keyboard_accessory/tab_layout_component/KeyboardAccessoryTabLayoutProperties.java",
@@ -129,6 +129,7 @@ android_resources("java_resources") {
     "java/res/layout/keyboard_accessory_sheet_tab_legacy_title.xml",
     "java/res/layout/keyboard_accessory_sheet_tab_option_toggle.xml",
     "java/res/layout/keyboard_accessory_sheet_tab_password_info.xml",
+    "java/res/layout/keyboard_accessory_sheet_tab_promo_code_info.xml",
     "java/res/layout/keyboard_accessory_sheet_tab_title.xml",
     "java/res/layout/keyboard_accessory_suggestion.xml",
     "java/res/layout/keyboard_accessory_tabs.xml",
diff --git a/chromium/chrome/android/features/start_surface/internal/BUILD.gn b/chromium/chrome/android/features/start_surface/internal/BUILD.gn
index a8852c93601..97a2622fb64 100644
--- a/chromium/chrome/android/features/start_surface/internal/BUILD.gn
+++ b/chromium/chrome/android/features/start_surface/internal/BUILD.gn
@@ -28,12 +28,9 @@ android_resources("java_resources") {
     "java/res/drawable-xxhdpi/ic_home.png",
     "java/res/drawable-xxxhdpi/ic_explore.png",
     "java/res/drawable-xxxhdpi/ic_home.png",
-    "java/res/layout/feed_placeholder_layout.xml",
     "java/res/layout/ss_bottom_bar_layout.xml",
     "java/res/layout/ss_explore_button.xml",
     "java/res/layout/ss_home_button.xml",
-    "java/res/values-night/colors.xml",
-    "java/res/values/colors.xml",
     "java/res/values/dimens.xml",
     "java/res/values/ids.xml",
   ]
@@ -53,7 +50,6 @@ android_library("java") {
     "java/src/org/chromium/chrome/features/start_surface/ExploreSurfaceNavigationDelegate.java",
     "java/src/org/chromium/chrome/features/start_surface/ExploreSurfaceViewBinder.java",
     "java/src/org/chromium/chrome/features/start_surface/FeedPlaceholderCoordinator.java",
-    "java/src/org/chromium/chrome/features/start_surface/FeedPlaceholderLayout.java",
     "java/src/org/chromium/chrome/features/start_surface/ReturnToStartSurfaceUtil.java",
     "java/src/org/chromium/chrome/features/start_surface/SecondaryTasksSurfaceViewBinder.java",
     "java/src/org/chromium/chrome/features/start_surface/StartSurfaceCoordinator.java",
@@ -72,6 +68,7 @@ android_library("java") {
     "//chrome/android/feed:chrome_feed_java_resources",
     "//chrome/browser/android/lifecycle:java",
     "//chrome/browser/browser_controls/android:java",
+    "//chrome/browser/feed/android:java",
     "//chrome/browser/flags:java",
     "//chrome/browser/lens:java",
     "//chrome/browser/preferences:java",
diff --git a/chromium/chrome/android/features/tab_ui/BUILD.gn b/chromium/chrome/android/features/tab_ui/BUILD.gn
index d13f34aee45..7eb4997474b 100644
--- a/chromium/chrome/android/features/tab_ui/BUILD.gn
+++ b/chromium/chrome/android/features/tab_ui/BUILD.gn
@@ -30,6 +30,7 @@ android_resources("java_resources") {
     "java/res/anim/iph_touch_point_background_animation.xml",
     "java/res/color/dark_text_color_list.xml",
     "java/res/drawable-v21/fake_search_box_bg_incognito.xml",
+    "java/res/drawable/chevron_right.xml",
     "java/res/drawable/fake_search_box_text_box_bg_incognito.xml",
     "java/res/drawable/hovered_tab_grid_card_background.xml",
     "java/res/drawable/ic_add_alert_blue.xml",
@@ -45,6 +46,7 @@ android_resources("java_resources") {
     "java/res/drawable/price_card_scrim.xml",
     "java/res/drawable/selected_tab_background.xml",
     "java/res/drawable/selected_tab_background_incognito.xml",
+    "java/res/drawable/single_tab_background.xml",
     "java/res/drawable/tab_grid_card_background.xml",
     "java/res/drawable/tab_grid_dialog_background.xml",
     "java/res/drawable/tab_grid_selection_list_icon.xml",
@@ -79,8 +81,6 @@ android_resources("java_resources") {
     "java/res/layout/tab_selection_editor_toolbar.xml",
     "java/res/layout/tab_strip_item.xml",
     "java/res/layout/tasks_view_layout.xml",
-    "java/res/values-night/dimens.xml",
-    "java/res/values-night/styles.xml",
     "java/res/values/attrs.xml",
     "java/res/values/colors.xml",
     "java/res/values/dimens.xml",
@@ -235,10 +235,12 @@ android_library("java") {
     "//components/site_engagement/content/android:java",
     "//content/public/android:content_java",
     "//content/public/android:content_java_resources",
+    "//net/android:net_java",
     "//third_party/android_deps:android_support_v7_appcompat_java",
     "//third_party/android_deps:material_design_java",
     "//third_party/androidx:androidx_annotation_annotation_java",
     "//third_party/androidx:androidx_appcompat_appcompat_resources_java",
+    "//third_party/androidx:androidx_coordinatorlayout_coordinatorlayout_java",
     "//third_party/androidx:androidx_core_core_java",
     "//third_party/androidx:androidx_lifecycle_lifecycle_common_java",
     "//third_party/androidx:androidx_lifecycle_lifecycle_runtime_java",
diff --git a/chromium/chrome/android/features/tab_ui/java/strings/android_chrome_tab_ui_strings.grd b/chromium/chrome/android/features/tab_ui/java/strings/android_chrome_tab_ui_strings.grd
index c27d929e484..22414b4db3e 100644
--- a/chromium/chrome/android/features/tab_ui/java/strings/android_chrome_tab_ui_strings.grd
+++ b/chromium/chrome/android/features/tab_ui/java/strings/android_chrome_tab_ui_strings.grd
@@ -425,6 +425,20 @@
         Get notified when prices drop
       </message>
 
+      <!-- Price Drop Notification strings -->
+      <message name="IDS_PRICE_DROP_NOTIFICATION_CONTENT_TITLE" desc="This text shows on the price drop notification. It tells users how much price drop on the corresponding product.">
+        <ph name="PRICE_DROP">%1$s<ex>$100</ex></ph> price drop on <ph name="PRODUCT_NAME">%2$s<ex>Chromebook</ex></ph>
+      </message>
+      <message name="IDS_PRICE_DROP_NOTIFICATION_CONTENT_TEXT" desc="This text shows on the price drop notification below the content title. It tells users the current price of the product and the source website.">
+        Now <ph name="CURRENT_PRICE">%1$s<ex>$799</ex></ph> on <ph name="SOURCE_WEBSITE">%2$s<ex>amazon.com</ex></ph>
+      </message>
+      <message name="IDS_PRICE_DROP_NOTIFICATION_ACTION_VISIT_SITE" desc="This text shows when users swipe down the price drop notification. When users click this button, we send them to the source website.">
+        Visit site
+      </message>
+      <message name="IDS_PRICE_DROP_NOTIFICATION_ACTION_TURN_OFF_ALERT" desc="This text shows when users swipe down the price drop notification. When users click this button, we won't send price drop notifications on this product to them any more.">
+        Turn off alert
+      </message>
+
       <!-- Merchant Viewer strings -->
       <message name="IDS_MERCHANT_VIEWER_MESSAGE_TITLE" desc="Message shown when merchant trust signals are available.">
         View store info?
@@ -457,6 +471,30 @@
       <message name="IDS_MERCHANT_VIEWER_PREVIEW_SHEET_TITLE" desc="Bottom sheet title for the merchant viewer experience.">
         Google | About this store
       </message>
+      <message name="IDS_MERCHANT_VIEWER_OMNIBOX_ICON_IPH" desc="IPH shown when merchant trust message is dismissed at the first time.">
+        View store info
+      </message>
+      <message name="IDS_PAGE_INFO_STORE_INFO_TITLE" desc="The title of the Store info row in Trusted Surface.">
+        Store info
+      </message>
+      <message name="IDS_PAGE_INFO_STORE_INFO_DESCRIPTION_WITH_NO_REVIEW" desc="The description of the Store info row in Trusted Surface for sites with ratings but no reviews.">
+        (store rating)
+      </message>
+      <message name="IDS_PAGE_INFO_STORE_INFO_DESCRIPTION_WITH_NO_RATING" desc="The description of the Store info row in Trusted Surface for sites with return policy but no ratings.">
+        See return policy and more
+      </message>
+      <message name="IDS_MERCHANT_VIEWER_PREVIEW_SHEET_DESCRIPTION" desc="The content description of the merchant viewer bottom sheet.">
+        Information about this store
+      </message>
+      <message name="IDS_MERCHANT_VIEWER_PREVIEW_SHEET_OPENED_HALF" desc="Accessibility string read when the merchant viewer bottom sheet is opened at half height. The sheet will occupy up to half the screen.">
+        Information about this store opened at half height
+      </message>
+      <message name="IDS_MERCHANT_VIEWER_PREVIEW_SHEET_OPENED_FULL" desc="Accessibility string read when the merchant viewer bottom sheet is opened at full height. The sheet will occupy up to full screen.">
+        Information about this store opened at full height
+      </message>
+      <message name="IDS_MERCHANT_VIEWER_PREVIEW_SHEET_CLOSED" desc="Accessibility string read when the merchant viewer bottom sheet is closed.">
+        Information about this store closed
+      </message>
     </messages>
   </release>
 </grit>
diff --git a/chromium/chrome/android/features/vr/BUILD.gn b/chromium/chrome/android/features/vr/BUILD.gn
index bd5556e6dbb..77aa17ecfc1 100644
--- a/chromium/chrome/android/features/vr/BUILD.gn
+++ b/chromium/chrome/android/features/vr/BUILD.gn
@@ -79,6 +79,7 @@ android_library("java") {
     "//chrome/browser/profiles/android:java",
     "//chrome/browser/tab:java",
     "//chrome/browser/tabmodel:java",
+    "//chrome/browser/ui/android/omnibox:util_java",
     "//chrome/browser/ui/messages/android:java",
     "//chrome/browser/util:java",
     "//components/browser_ui/modaldialog/android:java",