BASELINE: Update Chromium to 85.0.4183.14085-based

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

2 files changed, 34 insertions, 7 deletions

diff --git a/chromium/chrome/android/features/autofill_assistant/BUILD.gn b/chromium/chrome/android/features/autofill_assistant/BUILD.gn
index 7e20e804015..062a72afa93 100644
--- a/chromium/chrome/android/features/autofill_assistant/BUILD.gn
+++ b/chromium/chrome/android/features/autofill_assistant/BUILD.gn
@@ -16,6 +16,7 @@ android_library("animated_poodle_java") {
     "//base:base_java",
     "//chrome/android:chrome_java",
     "//third_party/android_deps:android_support_v7_appcompat_java",
+    "//third_party/android_deps:androidx_appcompat_appcompat_resources_java",
   ]
 
   sources = [ "java/src/org/chromium/chrome/browser/" +
@@ -33,6 +34,7 @@ android_library("java") {
     "//base:base_java",
     "//base:jni_java",
     "//chrome/android:chrome_java",
+    "//chrome/browser/browser_controls/android:java",
     "//chrome/browser/image_fetcher:java",
     "//chrome/browser/profiles/android:java",
     "//chrome/browser/settings:java",
@@ -51,6 +53,7 @@ android_library("java") {
     "//mojo/public/java:bindings_java",
     "//third_party/android_deps:android_support_v7_appcompat_java",
     "//third_party/android_deps:androidx_annotation_annotation_java",
+    "//third_party/android_deps:androidx_appcompat_appcompat_resources_java",
     "//third_party/android_deps:androidx_collection_collection_java",
     "//third_party/android_deps:androidx_coordinatorlayout_coordinatorlayout_java",
     "//third_party/android_deps:androidx_core_core_java",
@@ -133,6 +136,7 @@ android_library("java") {
     "java/src/org/chromium/chrome/browser/autofill_assistant/header/AssistantHeaderDelegate.java",
     "java/src/org/chromium/chrome/browser/autofill_assistant/header/AssistantHeaderModel.java",
     "java/src/org/chromium/chrome/browser/autofill_assistant/header/AssistantHeaderViewBinder.java",
+    "java/src/org/chromium/chrome/browser/autofill_assistant/header/AssistantStepProgressBar.java",
     "java/src/org/chromium/chrome/browser/autofill_assistant/infobox/AssistantInfoBox.java",
     "java/src/org/chromium/chrome/browser/autofill_assistant/infobox/AssistantInfoBoxCoordinator.java",
     "java/src/org/chromium/chrome/browser/autofill_assistant/infobox/AssistantInfoBoxModel.java",
@@ -251,6 +255,7 @@ android_library("test_java") {
     "javatests/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantHeaderUiTest.java",
     "javatests/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantInfoBoxUiTest.java",
     "javatests/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantKeyboardIntegrationTest.java",
+    "javatests/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantNavigationIntegrationTest.java",
     "javatests/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantOverlayIntegrationTest.java",
     "javatests/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantOverlayUiTest.java",
     "javatests/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantPasswordManagerIntegrationTest.java",
@@ -273,6 +278,9 @@ android_library("test_java") {
     "//chrome/browser/image_fetcher:java",
     "//chrome/browser/password_manager/android_test_helpers:test_support_java",
     "//chrome/browser/preferences:java",
+    "//chrome/browser/tab:java",
+    "//chrome/browser/tabmodel:java",
+    "//chrome/browser/util:java",
     "//chrome/test/android:chrome_java_test_support",
     "//components/autofill_assistant/browser:proto_java",
     "//components/browser_ui/android/bottomsheet:java",
@@ -284,12 +292,13 @@ android_library("test_java") {
     "//third_party/android_deps:androidx_recyclerview_recyclerview_java",
     "//third_party/android_deps:com_google_android_material_material_java",
     "//third_party/android_deps:com_google_protobuf_protobuf_javalite_java",
+    "//third_party/android_deps:espresso_java",
     "//third_party/android_support_test_runner:runner_java",
-    "//third_party/espresso:espresso_all_java",
     "//third_party/hamcrest:hamcrest_java",
     "//third_party/junit",
     "//third_party/mockito:mockito_java",
     "//ui/android:ui_full_java",
+    "//url:gurl_java",
   ]
 
   data = [ "//components/test/data/autofill_assistant/" ]
@@ -298,17 +307,32 @@ android_library("test_java") {
 android_resources("java_resources") {
   sources = [
     "java/res/drawable/autofill_assistant_actions_gradient.xml",
+    "java/res/drawable/autofill_assistant_circle_background.xml",
     "java/res/drawable/autofill_assistant_default_details.xml",
     "java/res/drawable/autofill_assistant_details_bg.xml",
     "java/res/drawable/autofill_assistant_lightblue_rect_bg.xml",
+    "java/res/drawable/autofill_assistant_rounded_corner_background.xml",
     "java/res/drawable/autofill_assistant_swipe_indicator.xml",
     "java/res/drawable/ic_add_outline_white_24dp.xml",
+    "java/res/drawable/ic_airline_seat_recline_normal_black_24dp.xml",
     "java/res/drawable/ic_autofill_assistant_add_circle_24dp.xml",
+    "java/res/drawable/ic_autofill_assistant_default_progress_start_black_24dp.xml",
+    "java/res/drawable/ic_check_circle_black_24dp.xml",
     "java/res/drawable/ic_clear_black_24dp.xml",
+    "java/res/drawable/ic_confirmation_number_black_24dp.xml",
+    "java/res/drawable/ic_directions_car_black_24dp.xml",
     "java/res/drawable/ic_done_black_24dp.xml",
+    "java/res/drawable/ic_fastfood_black_24dp.xml",
+    "java/res/drawable/ic_grocery_black_24dp.xml",
+    "java/res/drawable/ic_local_dining_black_24dp.xml",
     "java/res/drawable/ic_logo_assistant_24dp.xml",
+    "java/res/drawable/ic_payment_black_24dp.xml",
     "java/res/drawable/ic_refresh_black_24dp.xml",
     "java/res/drawable/ic_remove_outline_white_24dp.xml",
+    "java/res/drawable/ic_settings_black_24dp.xml",
+    "java/res/drawable/ic_shopping_basket_black_24dp.xml",
+    "java/res/drawable/ic_shopping_basket_black_24dp.xml",
+    "java/res/drawable/ic_vpn_key_black_24dp.xml",
     "java/res/layout/autofill_assistant_address_full.xml",
     "java/res/layout/autofill_assistant_address_summary.xml",
     "java/res/layout/autofill_assistant_bottom_sheet_content.xml",
diff --git a/chromium/chrome/android/features/autofill_assistant/java/strings/android_chrome_autofill_assistant_strings.grd b/chromium/chrome/android/features/autofill_assistant/java/strings/android_chrome_autofill_assistant_strings.grd
index 5fd39cdf0f5..d122756dff1 100644
--- a/chromium/chrome/android/features/autofill_assistant/java/strings/android_chrome_autofill_assistant_strings.grd
+++ b/chromium/chrome/android/features/autofill_assistant/java/strings/android_chrome_autofill_assistant_strings.grd
@@ -172,22 +172,25 @@
         I agree
       </message>
       <message name="IDS_AUTOFILL_ASSISTANT_INIT_TITLE" desc="The title of the onboarding screen.">
-        Try Google Assistant \n in Chrome
+        Try Google Assistant\nin Chrome
       </message>
       <message name="IDS_AUTOFILL_ASSISTANT_INIT_MESSAGE_RENT_CAR" desc="Onboarding message describing autofill assistant's capability for car rentals.">
-        Rent a car \n in just a few taps
+        Rent a car\nin just a few taps
       </message>
       <message name="IDS_AUTOFILL_ASSISTANT_INIT_MESSAGE_BUY_MOVIE_TICKETS" desc="Onboarding message describing autofill assistant's capability for movie tickets.">
-        Buy movie tickets \n in just a few taps
+        Buy movie tickets\nin just a few taps
       </message>
       <message name="IDS_AUTOFILL_ASSISTANT_INIT_MESSAGE_FOOD_ORDERING" desc="Onboarding message describing autofill assistant's capability for food ordering.">
-        Order food \n in just a few taps
+        Order food\nin just a few taps
       </message>
       <message name="IDS_AUTOFILL_ASSISTANT_INIT_MESSAGE_FLIGHTS_CHECKIN" desc="Onboarding message describing autofill assistant's capability for flights.">
-        Check in to your flight \n in just a few taps
+        Check in to your flight\nin just a few taps
       </message>
       <message name="IDS_AUTOFILL_ASSISTANT_INIT_MESSAGE_VOICE_SEARCH" desc="Onboarding message describing autofill assistant's capability for voice search.">
-        Try voice actions \n on websites
+        Try voice actions\non websites
+      </message>
+      <message name="IDS_AUTOFILL_ASSISTANT_INIT_MESSAGE_SHOPPING" desc="Onboarding message describing autofill assistant's capability for shopping.">
+        Buy things\nin just a few taps
       </message>
       <message name="IDS_AUTOFILL_ASSISTANT_INIT_MESSAGE" desc="Onboarding message describing autofill assistant's capability.">
         Google Assistant saves you time by helping you complete actions on the web, like search and checkout.