Reland "[TTFCC] Modularizing PersonalDataManager and AutofillTestHelper"

This is a reland of commit b41a926

The change is that a dependency was added to chrome/android/features/keyboard_accessory/BUILD.gn.
The bot that was failing was android-arm64-archive-rel and it
didn't fail before because it seems to not run on the CQ.

Original change's description:
> [TTFCC] Modularizing PersonalDataManager and AutofillTestHelper
>
> Changes:
> - PersonalDataManager, LegalMessageLine, AutofillUiUtils and
> AutofillEditorBase are moved out of chrome_java and into a separate
> target chrome/browser/autofill/android:java
> - PersonalDataManagerTest is moved to
> chrome/browser/autofill/test:test_java
> - AutofillTestHelper is moved to
> chrome/browser/autofill/test:test_support_java
>
> This change should make it easier to use PersonalDataManager.CreditCard
> without making copies or depending on chrome_java.
> The test helper is modularized for a similar reason.
>
> This CL is necessary for https://crrev.com/c/3963013 to be able to not
> introduce more dependencies on chrome_java.
>
> Bug: 1247698
> Change-Id: I55014e101325e3d5297ef87d352ec81996dcaf48
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4028643
> Reviewed-by: Marc Treib <treib@chromium.org>
> Reviewed-by: Stephen McGruer <smcgruer@chromium.org>
> Commit-Queue: Ivana Žužić <izuzic@google.com>
> Reviewed-by: Matthias Körber <koerber@google.com>
> Reviewed-by: Peter Wen <wnwen@chromium.org>
> Reviewed-by: Friedrich Horschig <fhorschig@chromium.org>
> Cr-Commit-Position: refs/heads/main@{#1075630}

Bug: 1247698
Change-Id: I18579787c1d8e38afeff23062c75cd0b5b569a12
Cq-Include-Trybots: luci.chromium.try:android_archive_rel_ng
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4054632
Reviewed-by: Peter Wen <wnwen@chromium.org>
Reviewed-by: Friedrich Horschig <fhorschig@chromium.org>
Reviewed-by: Matthias Körber <koerber@google.com>
Reviewed-by: Marc Treib <treib@chromium.org>
Commit-Queue: Ivana Žužić <izuzic@google.com>
Reviewed-by: Stephen McGruer <smcgruer@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1075859}

chrome/android/BUILD.gn

@@ -262,6 +262,7 @@ if (current_toolchain == default_toolchain) {
       ":ui_locale_string_resources",
       "//chrome/android/webapk/libs/common:splash_resources",
       "//chrome/app:java_strings_grd",
+      "//chrome/browser/autofill/android:java_resources",
       "//chrome/browser/download/android:java_resources",
       "//chrome/browser/feed/android:feed_java_resources",
       "//chrome/browser/feedback/android:java_resources",
@@ -406,6 +407,7 @@ if (current_toolchain == default_toolchain) {
       "//chrome/browser/android/customtabs/branding:java",
       "//chrome/browser/android/lifecycle:java",
       "//chrome/browser/android/messages:java",
+      "//chrome/browser/autofill/android:java",
       "//chrome/browser/back_press/android:java",
       "//chrome/browser/banners/android:java",
       "//chrome/browser/battery/android:java",
@@ -716,7 +718,6 @@ if (current_toolchain == default_toolchain) {
     deps += feed_deps
 
     srcjar_deps = [
-      ":autofill_verification_status_generated_enum",
       ":chrome_android_java_enums_srcjar",
       ":chrome_android_java_google_api_keys_srcjar",
       ":chrome_strict_mode_switch",
@@ -892,10 +893,6 @@ if (current_toolchain == default_toolchain) {
     ]
   }
 
-  java_cpp_enum("autofill_verification_status_generated_enum") {
-    sources = [ "//components/autofill/core/browser/data_model/autofill_structured_address_component.h" ]
-  }
-
   java_cpp_enum("chrome_android_java_enums_srcjar") {
     sources = [
       "//chrome/browser/android/customtabs/detached_resource_request.h",
@@ -1010,6 +1007,7 @@ if (current_toolchain == default_toolchain) {
       "//chrome/browser/android/customtabs/branding:junit",
       "//chrome/browser/android/httpclient:junit_tests",
       "//chrome/browser/android/lifecycle:java",
+      "//chrome/browser/autofill/android:java",
       "//chrome/browser/back_press/android:java",
       "//chrome/browser/back_press/android:junit",
       "//chrome/browser/banners/android:java",
@@ -1549,6 +1547,8 @@ if (current_toolchain == default_toolchain) {
       "//chrome/browser/android/lifecycle:java",
       "//chrome/browser/android/metrics:ukm_java_test_support",
       "//chrome/browser/android/metrics:ukm_javatests",
+      "//chrome/browser/autofill/android:java_resources",
+      "//chrome/browser/autofill/test:test_support_java",
       "//chrome/browser/back_press/android:java",
       "//chrome/browser/banners/android:java",
       "//chrome/browser/browser_controls/android:java",
@@ -3229,6 +3229,7 @@ if (current_toolchain == default_toolchain) {
       ":chrome_test_java",
       "//chrome/android/features/autofill_assistant:test_java",
       "//chrome/android/features/keyboard_accessory:test_java",
+      "//chrome/browser/autofill/test:test_java",
       "//chrome/browser/banners/android:javatests",
       "//chrome/browser/download/internal/android:javatests",
       "//chrome/browser/engagement/android:javatests",
@@ -3983,7 +3984,6 @@ generate_jni("chrome_jni_headers") {
     "java/src/org/chromium/chrome/browser/autofill/AutofillSnackbarController.java",
     "java/src/org/chromium/chrome/browser/autofill/CardUnmaskBridge.java",
     "java/src/org/chromium/chrome/browser/autofill/CreditCardScannerBridge.java",
-    "java/src/org/chromium/chrome/browser/autofill/PersonalDataManager.java",
     "java/src/org/chromium/chrome/browser/autofill/PhoneNumberUtil.java",
     "java/src/org/chromium/chrome/browser/autofill/SaveUpdateAddressProfilePrompt.java",
     "java/src/org/chromium/chrome/browser/autofill/SaveUpdateAddressProfilePromptController.java",

chrome/android/chrome_java_resources.gni

@@ -447,7 +447,6 @@ chrome_java_resources = [
   "java/res/drawable/sharing_print.xml",
   "java/res/drawable/shield.xml",
   "java/res/drawable/signin_header_animation.xml",
-  "java/res/drawable/store_locally_tooltip_background.xml",
   "java/res/drawable/tab_indicator.xml",
   "java/res/drawable/tile_view_hairline_border_background.xml",
   "java/res/drawable/virtual_card_enrollment_illustration.xml",
@@ -462,10 +461,7 @@ chrome_java_resources = [
   "java/res/layout/autofill_billing_address_dropdown.xml",
   "java/res/layout/autofill_card_unmask_prompt.xml",
   "java/res/layout/autofill_cc_details.xml",
-  "java/res/layout/autofill_editor_base.xml",
-  "java/res/layout/autofill_editor_base_buttons.xml",
   "java/res/layout/autofill_expiration_date_fix_flow.xml",
-  "java/res/layout/autofill_local_card_editor.xml",
   "java/res/layout/autofill_name_fixflow.xml",
   "java/res/layout/autofill_save_address_profile_prompt.xml",
   "java/res/layout/autofill_save_card_base_layout.xml",
@@ -475,7 +471,6 @@ chrome_java_resources = [
   "java/res/layout/autofill_server_data_text_label.xml",
   "java/res/layout/autofill_update_address_profile_prompt.xml",
   "java/res/layout/bookmark_action_bar.xml",
-  "java/res/layout/bookmark_add_edit_folder_activity.xml",
   "java/res/layout/bookmark_edit.xml",
   "java/res/layout/bookmark_folder_row.xml",
   "java/res/layout/bookmark_folder_select_activity.xml",
@@ -518,7 +513,6 @@ chrome_java_resources = [
   "java/res/layout/distilled_page_font_family_spinner.xml",
   "java/res/layout/distilled_page_prefs_view.xml",
   "java/res/layout/divider_line_menu_item.xml",
-  "java/res/layout/editable_option_editor_footer.xml",
   "java/res/layout/editable_option_editor_icons.xml",
   "java/res/layout/empty_accessory_sheet.xml",
   "java/res/layout/empty_background_view_tablet.xml",
@@ -621,7 +615,6 @@ chrome_java_resources = [
   "java/res/menu/custom_tabs_menu.xml",
   "java/res/menu/history_manager_menu.xml",
   "java/res/menu/main_menu.xml",
-  "java/res/menu/prefeditor_editor_menu.xml",
   "java/res/menu/save_password_preferences_action_bar_menu.xml",
   "java/res/transition/fade.xml",
   "java/res/transition/move_image.xml",

chrome/android/chrome_java_sources.gni

@@ -125,13 +125,10 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/autofill/AutofillPopupBridge.java",
   "java/src/org/chromium/chrome/browser/autofill/AutofillSaveCardPromptBase.java",
   "java/src/org/chromium/chrome/browser/autofill/AutofillSnackbarController.java",
-  "java/src/org/chromium/chrome/browser/autofill/AutofillUiUtils.java",
   "java/src/org/chromium/chrome/browser/autofill/CardUnmaskBridge.java",
   "java/src/org/chromium/chrome/browser/autofill/CardUnmaskPrompt.java",
   "java/src/org/chromium/chrome/browser/autofill/CreditCardScanner.java",
   "java/src/org/chromium/chrome/browser/autofill/CreditCardScannerBridge.java",
-  "java/src/org/chromium/chrome/browser/autofill/LegalMessageLine.java",
-  "java/src/org/chromium/chrome/browser/autofill/PersonalDataManager.java",
   "java/src/org/chromium/chrome/browser/autofill/PhoneNumberUtil.java",
   "java/src/org/chromium/chrome/browser/autofill/SaveUpdateAddressProfilePrompt.java",
   "java/src/org/chromium/chrome/browser/autofill/SaveUpdateAddressProfilePromptController.java",
@@ -153,7 +150,6 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/autofill/settings/AndroidPaymentAppsFragment.java",
   "java/src/org/chromium/chrome/browser/autofill/settings/AutofillCreditCardEditor.java",
   "java/src/org/chromium/chrome/browser/autofill/settings/AutofillEditLinkPreference.java",
-  "java/src/org/chromium/chrome/browser/autofill/settings/AutofillEditorBase.java",
   "java/src/org/chromium/chrome/browser/autofill/settings/AutofillLocalCardEditor.java",
   "java/src/org/chromium/chrome/browser/autofill/settings/AutofillPaymentMethodsDelegate.java",
   "java/src/org/chromium/chrome/browser/autofill/settings/AutofillPaymentMethodsFragment.java",

chrome/android/chrome_test_java_sources.gni

@@ -62,9 +62,7 @@ chrome_test_java_sources = [
   "javatests/src/org/chromium/chrome/browser/autofill/AutofillPopupTest.java",
   "javatests/src/org/chromium/chrome/browser/autofill/AutofillPopupWithKeyboardTest.java",
   "javatests/src/org/chromium/chrome/browser/autofill/AutofillSnackbarControllerTest.java",
-  "javatests/src/org/chromium/chrome/browser/autofill/AutofillTestHelper.java",
   "javatests/src/org/chromium/chrome/browser/autofill/AutofillUpstreamTest.java",
-  "javatests/src/org/chromium/chrome/browser/autofill/PersonalDataManagerTest.java",
   "javatests/src/org/chromium/chrome/browser/autofill/settings/AutofillLocalCardEditorTest.java",
   "javatests/src/org/chromium/chrome/browser/autofill/settings/AutofillPaymentMethodsFragmentTest.java",
   "javatests/src/org/chromium/chrome/browser/autofill/settings/AutofillProfilesFragmentTest.java",

chrome/android/features/autofill_assistant/BUILD.gn

@@ -138,6 +138,8 @@ android_library("test_java") {
     "//chrome/android:chrome_java",
     "//chrome/android:chrome_test_java",
     "//chrome/android:chrome_test_util_java",
+    "//chrome/browser/autofill/android:java",
+    "//chrome/browser/autofill/test:test_support_java",
     "//chrome/browser/first_run/android:java",
     "//chrome/browser/flags:java",
     "//chrome/browser/password_manager/android:java",

chrome/android/features/keyboard_accessory/BUILD.gn

@@ -85,6 +85,8 @@ android_library("test_java") {
     "//chrome/android:chrome_java",
     "//chrome/android:chrome_test_java",
     "//chrome/android:chrome_test_util_java",
+    "//chrome/browser/autofill/android:java",
+    "//chrome/browser/autofill/test:test_support_java",
     "//chrome/browser/feature_engagement:java",
     "//chrome/browser/flags:java",
     "//chrome/browser/password_manager/android:java",

chrome/android/features/keyboard_accessory/internal/BUILD.gn

@@ -18,6 +18,7 @@ android_library("internal_java") {
     # TODO(crbug/951695): Cyclic dependency. Depend on public only when ready.
     "//chrome/android:chrome_java",
     "//chrome/android/features/keyboard_accessory/public:public_java",
+    "//chrome/browser/autofill/android:java",
     "//chrome/browser/back_press/android:java",
     "//chrome/browser/feature_engagement:java",
     "//chrome/browser/flags:java",

chrome/android/java/res/values/dimens.xml

@@ -133,10 +133,6 @@ found in the LICENSE file.
     <dimen name="signin_chooser_padding">16dp</dimen>
     <dimen name="signin_screen_top_padding">50dp</dimen>
 
-    <!-- Autofill tooltip dimensions -->
-    <dimen name="autofill_tooltip_horizontal_padding">16dp</dimen>
-    <dimen name="autofill_tooltip_vertical_padding">16dp</dimen>
-
     <!-- ModalDialogView dimensions -->
     <dimen name="tab_modal_scrim_vertical_margin">16dp</dimen>
 

chrome/android/java/src/org/chromium/chrome/browser/autofill/prefeditor/EditorDialog.java

@@ -40,8 +40,8 @@
 import androidx.core.view.MarginLayoutParamsCompat;
 
 import org.chromium.chrome.R;
-import org.chromium.chrome.browser.autofill.AutofillUiUtils;
 import org.chromium.chrome.browser.autofill.settings.CreditCardNumberFormattingTextWatcher;
+import org.chromium.chrome.browser.feedback.HelpAndFeedbackLauncherImpl;
 import org.chromium.chrome.browser.profiles.Profile;
 import org.chromium.chrome.browser.util.ChromeAccessibilityUtil;
 import org.chromium.components.autofill.prefeditor.EditorFieldModel;
@@ -215,7 +215,8 @@ public boolean onMenuItemClick(MenuItem item) {
                     mDeleteRunnable.run();
                     animateOutDialog();
                 } else if (item.getItemId() == R.id.help_menu_id) {
-                    AutofillUiUtils.launchAutofillHelpPage(mActivity, mProfile);
+                    HelpAndFeedbackLauncherImpl.getInstance().show(mActivity,
+                            mActivity.getString(R.string.help_context_autofill), mProfile, null);
                 }
                 return true;
             }

chrome/android/java/src/org/chromium/chrome/browser/autofill/settings/AutofillCreditCardEditor.java

@@ -8,15 +8,19 @@
 import android.os.Bundle;
 import android.text.TextUtils;
 import android.view.LayoutInflater;
+import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ArrayAdapter;
 import android.widget.Spinner;
 
 import org.chromium.chrome.R;
+import org.chromium.chrome.browser.autofill.AutofillEditorBase;
 import org.chromium.chrome.browser.autofill.PersonalDataManager;
 import org.chromium.chrome.browser.autofill.PersonalDataManager.AutofillProfile;
 import org.chromium.chrome.browser.autofill.PersonalDataManager.CreditCard;
+import org.chromium.chrome.browser.feedback.HelpAndFeedbackLauncherImpl;
+import org.chromium.chrome.browser.profiles.Profile;
 
 import java.util.List;
 
@@ -92,4 +96,21 @@ protected void initializeButtons(View v) {
         // the billing address field because it is a drop down menu.
         mBillingAddress.setOnTouchListener(this);
     }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        if (item.getItemId() == R.id.delete_menu_id) {
+            deleteEntry();
+            getActivity().finish();
+            return true;
+        }
+        if (item.getItemId() == R.id.help_menu_id) {
+            HelpAndFeedbackLauncherImpl.getInstance().show(getActivity(),
+                    getActivity().getString(R.string.help_context_autofill),
+                    Profile.getLastUsedRegularProfile(), null);
+            return true;
+        }
+
+        return super.onOptionsItemSelected(item);
+    }
 }