From 900c2895d66cbf390d80a06feef7b28021122900 Mon Sep 17 00:00:00 2001
From: csagan5 <32685696+csagan5@users.noreply.github.com>
Date: Sat, 19 Mar 2022 00:54:24 +0100
Subject: [PATCH] Remove autofill and payments

---
 .../Remove-autofill-and-payments.patch        | 1532 +++++++++++++++++
 1 file changed, 1532 insertions(+)
 create mode 100644 build/patches/Remove-autofill-and-payments.patch

diff --git a/build/patches/Remove-autofill-and-payments.patch b/build/patches/Remove-autofill-and-payments.patch
new file mode 100644
index 00000000..a6d35627
--- /dev/null
+++ b/build/patches/Remove-autofill-and-payments.patch
@@ -0,0 +1,1532 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Fri, 18 Mar 2022 23:08:04 +0100
+Subject: Remove autofill and payments
+
+---
+ chrome/android/BUILD.gn                       |  56 ----
+ chrome/android/chrome_java_sources.gni        |  90 ------
+ .../java/res/xml/privacy_preferences.xml      |   5 -
+ .../privacy/settings/PrivacySettings.java     |  26 --
+ chrome/android/java_sources.gni               |   3 -
+ chrome/browser/BUILD.gn                       | 135 ---------
+ chrome/browser/preferences/BUILD.gn           |   2 -
+ .../browser/resources/settings/settings.gni   |  39 ---
+ chrome/browser/ui/BUILD.gn                    | 279 ------------------
+ .../strings/android_chrome_strings.grd        |  69 -----
+ chrome/chrome_paks.gni                        |   2 -
+ components/BUILD.gn                           |  37 ---
+ .../contacts_picker/android/BUILD.gn          |   2 -
+ components/payments/content/android/BUILD.gn  |   2 -
+ components/payments/core/BUILD.gn             |   5 -
+ components/unified_consent/BUILD.gn           |   1 -
+ components/webauthn/android/BUILD.gn          |   1 -
+ components/webdata_services/BUILD.gn          |   1 -
+ content/public/android/BUILD.gn               |   1 -
+ 19 files changed, 756 deletions(-)
+
+diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
+--- a/chrome/android/BUILD.gn
++++ b/chrome/android/BUILD.gn
+@@ -220,7 +220,6 @@ android_resources("chrome_app_java_resources") {
+     "//chrome/browser/ui/android/toolbar:java_resources",
+     "//chrome/browser/ui/android/webid/internal:java_resources",
+     "//chrome/browser/ui/messages/android:java_resources",
+-    "//components/autofill/android:autofill_java_resources",
+     "//components/blocked_content/android:java_resources",
+     "//components/browser_ui/bottomsheet/android:java_resources",
+     "//components/browser_ui/contacts_picker/android:java_resources",
+@@ -236,7 +235,6 @@ android_resources("chrome_app_java_resources") {
+     "//components/messages/android:java_resources",
+     "//components/omnibox/browser:java_resources",
+     "//components/page_info/android:java_resources",
+-    "//components/payments/content/android:java_resources",
+     "//components/permissions/android:java_resources",
+     "//components/policy:app_restrictions_resources",
+     "//components/strings:components_locale_settings_grd",
+@@ -427,9 +425,6 @@ android_library("chrome_java") {
+     "//chrome/browser/webapps/android:java",
+     "//chrome/browser/webauthn/android:java",
+     "//chrome/browser/xsurface:java",
+-    "//components/autofill/android:autofill_java",
+-    "//components/autofill_assistant/browser:proto_java",
+-    "//components/android_autofill/browser:java",
+     "//components/background_task_scheduler:background_task_scheduler_java",
+     "//components/background_task_scheduler:background_task_scheduler_task_ids_java",
+     "//components/bookmarks/common/android:bookmarks_java",
+@@ -508,9 +503,6 @@ android_library("chrome_java") {
+     "//components/paint_preview/browser/android:java",
+     "//components/paint_preview/player/android:java",
+     "//components/password_manager/core/browser:password_manager_java_enums",
+-    "//components/payments/content/android:java",
+-    "//components/payments/content/android:service_java",
+-    "//components/payments/mojom:mojom_java",
+     "//components/permissions/android:java",
+     "//components/policy/android:policy_java",
+     "//components/prefs/android:java",
+@@ -620,7 +612,6 @@ android_library("chrome_java") {
+   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",
+@@ -638,8 +629,6 @@ android_library("chrome_java") {
+     "//chrome/browser/notifications/scheduler/public:jni_enums",
+     "//chrome/browser/supervised_user/supervised_user_error_page:enums_srcjar",
+     "//chrome/browser/ui:duplicate_download_enums_java",
+-    "//components/autofill_assistant/browser:autofill_assistant_enums_java",
+-    "//components/autofill_assistant/browser:autofill_assistant_intent_strings_java",
+     "//components/browsing_data/core:browsing_data_utils_java",
+     "//components/browsing_data/core:clear_browsing_data_tab_java",
+     "//components/data_reduction_proxy/core/browser:data_reduction_proxy_savings_cleared_enum_java",
+@@ -748,7 +737,6 @@ java_group("chrome_all_java") {
+     "//chrome/browser/tabmodel/internal:java",
+     "//chrome/browser/touch_to_fill/android/internal:java",
+     "//chrome/browser/ui/android/appmenu/internal:java",
+-    "//chrome/browser/ui/android/autofill/internal:java",
+     "//chrome/browser/ui/android/webid/internal:java",
+     "//chrome/browser/video_tutorials/internal:java",
+     "//components/browser_ui/bottomsheet/android/internal:java",
+@@ -756,10 +744,6 @@ java_group("chrome_all_java") {
+     "//components/segmentation_platform/internal:internal_java",
+   ]
+ 
+-  if (disable_autofill_assistant_dfm) {
+-    deps += [ "//chrome/android/features/autofill_assistant:java" ]
+-  }
+-
+   if (disable_tab_ui_dfm) {
+     deps += [
+       "//chrome/android/features/tab_ui:java",
+@@ -773,8 +757,6 @@ java_group("chrome_all_java") {
+ group("jni_headers") {
+   public_deps = [
+     ":chrome_jni_headers",
+-    "//chrome/android/features/autofill_assistant:jni_headers",
+-    "//chrome/android/features/autofill_assistant:jni_headers_public",
+     "//chrome/android/features/keyboard_accessory:jni_headers",
+     "//chrome/android/features/start_surface:jni_headers",
+     "//chrome/browser/android/browserservices/metrics:jni_headers",
+@@ -823,10 +805,6 @@ action_with_pydeps("chrome_android_java_google_api_keys_srcjar") {
+   ]
+ }
+ 
+-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",
+@@ -970,7 +948,6 @@ junit_binary("chrome_junit_tests") {
+     "//chrome/browser/page_annotations/test/android:junit",
+     "//chrome/browser/password_edit_dialog/android:junit",
+     "//chrome/browser/password_entry_edit/android/internal:junit",
+-    "//chrome/browser/payments/android:junit",
+     "//chrome/browser/performance_hints/android:java",
+     "//chrome/browser/policy/android:java",
+     "//chrome/browser/policy/android:junit",
+@@ -996,8 +973,6 @@ junit_binary("chrome_junit_tests") {
+     "//chrome/browser/thumbnail:java",
+     "//chrome/browser/ui/android/appmenu:java",
+     "//chrome/browser/ui/android/appmenu/internal:junit",
+-    "//chrome/browser/ui/android/autofill/internal:junit",
+-    "//chrome/browser/ui/android/default_browser_promo:java",
+     "//chrome/browser/ui/android/default_browser_promo:junit",
+     "//chrome/browser/ui/android/favicon:java",
+     "//chrome/browser/ui/android/layouts:java",
+@@ -1032,7 +1007,6 @@ junit_binary("chrome_junit_tests") {
+     "//chrome/browser/xsurface:java",
+     "//chrome/test:sync_integration_test_support_java",
+     "//chrome/test/android:chrome_java_test_support",
+-    "//components/autofill/android:full_autofill_java",
+     "//components/background_task_scheduler:background_task_scheduler_java",
+     "//components/background_task_scheduler:background_task_scheduler_task_ids_java",
+     "//components/bookmarks/common/android:bookmarks_java",
+@@ -1071,9 +1045,6 @@ junit_binary("chrome_junit_tests") {
+     "//components/page_info/android:java",
+     "//components/page_info/core:proto_java",
+     "//components/paint_preview/player/android:java",
+-    "//components/payments/content/android:java",
+-    "//components/payments/content/android:service_java",
+-    "//components/payments/mojom:mojom_java",
+     "//components/policy/android:policy_java",
+     "//components/prefs/android:java",
+     "//components/schema_org/common:mojom_java",
+@@ -1190,7 +1161,6 @@ android_library("chrome_test_util_java") {
+     "javatests/src/org/chromium/chrome/browser/customtabs/CustomTabsTestUtils.java",
+     "javatests/src/org/chromium/chrome/browser/directactions/FakeDirectActionReporter.java",
+     "javatests/src/org/chromium/chrome/browser/modaldialog/ChromeModalDialogTestUtils.java",
+-    "javatests/src/org/chromium/chrome/browser/payments/PaymentRequestTestRule.java",
+     "javatests/src/org/chromium/chrome/browser/webapps/TestFetchStorageCallback.java",
+     "javatests/src/org/chromium/chrome/browser/webapps/WebappActivityTestRule.java",
+   ]
+@@ -1209,9 +1179,6 @@ android_library("chrome_test_util_java") {
+     "//chrome/browser/tab:java",
+     "//chrome/browser/ui/android/appmenu:java",
+     "//chrome/test/android:chrome_java_test_support",
+-    "//components/payments/content/android:java",
+-    "//components/payments/content/android:service_java",
+-    "//components/payments/mojom:mojom_java",
+     "//content/public/android:content_java",
+     "//content/public/test/android:content_java_test_support",
+     "//net/android:net_java_test_support",
+@@ -1410,7 +1377,6 @@ android_library("chrome_test_java") {
+     "//chrome/test/android:chrome_java_test_pagecontroller",
+     "//chrome/test/android:chrome_java_test_support",
+     "//chrome/test/android/test_trusted_web_activity:test_trusted_web_activity_java",
+-    "//components/autofill/android:autofill_java",
+     "//components/background_task_scheduler:background_task_scheduler_java",
+     "//components/background_task_scheduler:background_task_scheduler_task_ids_java",
+     "//components/background_task_scheduler/internal:background_task_scheduler_javatests",
+@@ -1494,10 +1460,6 @@ android_library("chrome_test_java") {
+     "//components/paint_preview/player/android:java",
+     "//components/paint_preview/player/android:javatests",
+     "//components/password_manager/core/browser:password_manager_java_enums",
+-    "//components/payments/content/android:java",
+-    "//components/payments/content/android:javatests",
+-    "//components/payments/content/android:service_java",
+-    "//components/payments/mojom:mojom_java",
+     "//components/permissions/android:java",
+     "//components/policy/android:policy_java",
+     "//components/policy/android:policy_java_test_support",
+@@ -1625,7 +1587,6 @@ android_library("chrome_test_java") {
+     "//chrome/test/data/translate/",
+     "//chrome/test/media_router/resources/",
+     "//components/test/data/autofill/",
+-    "//components/test/data/payments/",
+     "//content/test/data/browsing_data/",
+     "//content/test/data/android/authenticator.html",
+     "//content/test/data/android/auto_downloads_permissions.html",
+@@ -2553,7 +2514,6 @@ android_library("base_module_java") {
+     # TODO(crbug.com/1126301): Consider moving these to the chrome module to
+     # reduce base dex size.
+     "//components/background_task_scheduler:background_task_scheduler_java",
+-    "//components/payments/content/android:service_java",
+     "//third_party/androidx:androidx_browser_browser_java",
+   ]
+ 
+@@ -3781,19 +3741,6 @@ generate_jni("chrome_jni_headers") {
+     "java/src/org/chromium/chrome/browser/app/send_tab_to_self/SendTabToSelfNotificationReceiver.java",
+     "java/src/org/chromium/chrome/browser/app/tab_activity_glue/ReparentingTask.java",
+     "java/src/org/chromium/chrome/browser/app/video_tutorials/VideoTutorialsServiceUtils.java",
+-    "java/src/org/chromium/chrome/browser/autofill/AutofillExpirationDateFixFlowBridge.java",
+-    "java/src/org/chromium/chrome/browser/autofill/AutofillLogger.java",
+-    "java/src/org/chromium/chrome/browser/autofill/AutofillMessageConfirmFlowBridge.java",
+-    "java/src/org/chromium/chrome/browser/autofill/AutofillNameFixFlowBridge.java",
+-    "java/src/org/chromium/chrome/browser/autofill/AutofillPopupBridge.java",
+-    "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",
+-    "java/src/org/chromium/chrome/browser/autofill/settings/AutofillProfileBridge.java",
+     "java/src/org/chromium/chrome/browser/background_sync/BackgroundSyncBackgroundTask.java",
+     "java/src/org/chromium/chrome/browser/background_sync/BackgroundSyncBackgroundTaskScheduler.java",
+     "java/src/org/chromium/chrome/browser/background_sync/GooglePlayServicesChecker.java",
+@@ -3853,9 +3800,6 @@ generate_jni("chrome_jni_headers") {
+     "java/src/org/chromium/chrome/browser/history/HistoryDeletionBridge.java",
+     "java/src/org/chromium/chrome/browser/history/HistoryDeletionInfo.java",
+     "java/src/org/chromium/chrome/browser/historyreport/HistoryReportJniBridge.java",
+-    "java/src/org/chromium/chrome/browser/infobar/AutofillCreditCardFillingInfoBar.java",
+-    "java/src/org/chromium/chrome/browser/infobar/AutofillOfferNotificationInfoBar.java",
+-    "java/src/org/chromium/chrome/browser/infobar/AutofillSaveCardInfoBar.java",
+     "java/src/org/chromium/chrome/browser/infobar/DownloadProgressInfoBar.java",
+     "java/src/org/chromium/chrome/browser/infobar/DuplicateDownloadInfoBar.java",
+     "java/src/org/chromium/chrome/browser/infobar/FramebustBlockInfoBar.java",
+diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java_sources.gni
+--- a/chrome/android/chrome_java_sources.gni
++++ b/chrome/android/chrome_java_sources.gni
+@@ -98,56 +98,6 @@ chrome_java_sources = [
+   "java/src/org/chromium/chrome/browser/app/video_tutorials/VideoTutorialListActivity.java",
+   "java/src/org/chromium/chrome/browser/app/video_tutorials/VideoTutorialShareHelper.java",
+   "java/src/org/chromium/chrome/browser/app/video_tutorials/VideoTutorialsServiceUtils.java",
+-  "java/src/org/chromium/chrome/browser/autofill/AutofillExpirationDateFixFlowBridge.java",
+-  "java/src/org/chromium/chrome/browser/autofill/AutofillExpirationDateFixFlowPrompt.java",
+-  "java/src/org/chromium/chrome/browser/autofill/AutofillLogger.java",
+-  "java/src/org/chromium/chrome/browser/autofill/AutofillMessageConfirmFlowBridge.java",
+-  "java/src/org/chromium/chrome/browser/autofill/AutofillNameFixFlowBridge.java",
+-  "java/src/org/chromium/chrome/browser/autofill/AutofillNameFixFlowPrompt.java",
+-  "java/src/org/chromium/chrome/browser/autofill/AutofillPopupBridge.java",
+-  "java/src/org/chromium/chrome/browser/autofill/AutofillSaveCardConfirmFlowPrompt.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",
+-  "java/src/org/chromium/chrome/browser/autofill/prefeditor/DropdownFieldAdapter.java",
+-  "java/src/org/chromium/chrome/browser/autofill/prefeditor/EditorBase.java",
+-  "java/src/org/chromium/chrome/browser/autofill/prefeditor/EditorDialog.java",
+-  "java/src/org/chromium/chrome/browser/autofill/prefeditor/EditorDialogToolbar.java",
+-  "java/src/org/chromium/chrome/browser/autofill/prefeditor/EditorDropdownField.java",
+-  "java/src/org/chromium/chrome/browser/autofill/prefeditor/EditorFieldModel.java",
+-  "java/src/org/chromium/chrome/browser/autofill/prefeditor/EditorFieldView.java",
+-  "java/src/org/chromium/chrome/browser/autofill/prefeditor/EditorIconsField.java",
+-  "java/src/org/chromium/chrome/browser/autofill/prefeditor/EditorLabelField.java",
+-  "java/src/org/chromium/chrome/browser/autofill/prefeditor/EditorModel.java",
+-  "java/src/org/chromium/chrome/browser/autofill/prefeditor/EditorObserverForTest.java",
+-  "java/src/org/chromium/chrome/browser/autofill/prefeditor/EditorTextField.java",
+-  "java/src/org/chromium/chrome/browser/autofill/prefeditor/ExpandableGridView.java",
+-  "java/src/org/chromium/chrome/browser/autofill/prefeditor/HintedDropDownAdapter.java",
+-  "java/src/org/chromium/chrome/browser/autofill/prefeditor/HintedDropDownAdapterWithPlusIcon.java",
+-  "java/src/org/chromium/chrome/browser/autofill/settings/AddressEditor.java",
+-  "java/src/org/chromium/chrome/browser/autofill/settings/AndroidPaymentAppPreference.java",
+-  "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/AutofillPaymentMethodsFragment.java",
+-  "java/src/org/chromium/chrome/browser/autofill/settings/AutofillProfileBridge.java",
+-  "java/src/org/chromium/chrome/browser/autofill/settings/AutofillProfileEditorPreference.java",
+-  "java/src/org/chromium/chrome/browser/autofill/settings/AutofillProfilesFragment.java",
+-  "java/src/org/chromium/chrome/browser/autofill/settings/AutofillServerCardEditor.java",
+-  "java/src/org/chromium/chrome/browser/autofill/settings/CardEditor.java",
+-  "java/src/org/chromium/chrome/browser/autofill/settings/CreditCardNumberFormattingTextWatcher.java",
+-  "java/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantPreferenceFragment.java",
+   "java/src/org/chromium/chrome/browser/background_sync/BackgroundSyncBackgroundTask.java",
+   "java/src/org/chromium/chrome/browser/background_sync/BackgroundSyncBackgroundTaskScheduler.java",
+   "java/src/org/chromium/chrome/browser/background_sync/GooglePlayServicesChecker.java",
+@@ -859,47 +809,7 @@ chrome_java_sources = [
+   "java/src/org/chromium/chrome/browser/password_manager/settings/SavedPasswordEntry.java",
+   "java/src/org/chromium/chrome/browser/password_manager/settings/SingleThreadBarrierClosure.java",
+   "java/src/org/chromium/chrome/browser/password_manager/settings/TimedCallbackDelayer.java",
+-  "java/src/org/chromium/chrome/browser/payments/AddressEditor.java",
+-  "java/src/org/chromium/chrome/browser/payments/AutofillAddress.java",
+-  "java/src/org/chromium/chrome/browser/payments/AutofillContact.java",
+-  "java/src/org/chromium/chrome/browser/payments/AutofillPaymentAppCreator.java",
+-  "java/src/org/chromium/chrome/browser/payments/AutofillPaymentAppFactory.java",
+-  "java/src/org/chromium/chrome/browser/payments/AutofillPaymentInstrument.java",
+-  "java/src/org/chromium/chrome/browser/payments/CardEditor.java",
+-  "java/src/org/chromium/chrome/browser/payments/ChromePaymentRequestFactory.java",
+-  "java/src/org/chromium/chrome/browser/payments/ChromePaymentRequestService.java",
+-  "java/src/org/chromium/chrome/browser/payments/ChromePaymentResponseHelper.java",
+-  "java/src/org/chromium/chrome/browser/payments/ContactEditor.java",
+-  "java/src/org/chromium/chrome/browser/payments/PaymentPreferencesUtil.java",
+-  "java/src/org/chromium/chrome/browser/payments/ServiceWorkerPaymentAppBridge.java",
+-  "java/src/org/chromium/chrome/browser/payments/SettingsAutofillAndPaymentsObserver.java",
+-  "java/src/org/chromium/chrome/browser/payments/ShippingStrings.java",
+-  "java/src/org/chromium/chrome/browser/payments/handler/PaymentHandlerActionModeCallback.java",
+-  "java/src/org/chromium/chrome/browser/payments/handler/PaymentHandlerCoordinator.java",
+-  "java/src/org/chromium/chrome/browser/payments/handler/PaymentHandlerMediator.java",
+-  "java/src/org/chromium/chrome/browser/payments/handler/PaymentHandlerProperties.java",
+-  "java/src/org/chromium/chrome/browser/payments/handler/PaymentHandlerView.java",
+-  "java/src/org/chromium/chrome/browser/payments/handler/PaymentHandlerViewBinder.java",
+-  "java/src/org/chromium/chrome/browser/payments/handler/toolbar/PaymentHandlerToolbarCoordinator.java",
+-  "java/src/org/chromium/chrome/browser/payments/handler/toolbar/PaymentHandlerToolbarMediator.java",
+-  "java/src/org/chromium/chrome/browser/payments/handler/toolbar/PaymentHandlerToolbarProperties.java",
+-  "java/src/org/chromium/chrome/browser/payments/handler/toolbar/PaymentHandlerToolbarView.java",
+-  "java/src/org/chromium/chrome/browser/payments/handler/toolbar/PaymentHandlerToolbarViewBinder.java",
+-  "java/src/org/chromium/chrome/browser/payments/ui/AnimatorProperties.java",
+-  "java/src/org/chromium/chrome/browser/payments/ui/ContactDetailsSection.java",
+-  "java/src/org/chromium/chrome/browser/payments/ui/DimmingDialog.java",
+-  "java/src/org/chromium/chrome/browser/payments/ui/LineItem.java",
+-  "java/src/org/chromium/chrome/browser/payments/ui/PaymentAppComparator.java",
+   "java/src/org/chromium/chrome/browser/settings/UserAgentPreferences.java",
+-  "java/src/org/chromium/chrome/browser/payments/ui/PaymentInformation.java",
+-  "java/src/org/chromium/chrome/browser/payments/ui/PaymentRequestBottomBar.java",
+-  "java/src/org/chromium/chrome/browser/payments/ui/PaymentRequestHeader.java",
+-  "java/src/org/chromium/chrome/browser/payments/ui/PaymentRequestSection.java",
+-  "java/src/org/chromium/chrome/browser/payments/ui/PaymentRequestUI.java",
+-  "java/src/org/chromium/chrome/browser/payments/ui/PaymentUiService.java",
+-  "java/src/org/chromium/chrome/browser/payments/ui/SectionInformation.java",
+-  "java/src/org/chromium/chrome/browser/payments/ui/SectionUiUtils.java",
+-  "java/src/org/chromium/chrome/browser/payments/ui/ShoppingCart.java",
+   "java/src/org/chromium/chrome/browser/permissions/NotificationBlockedDialog.java",
+   "java/src/org/chromium/chrome/browser/permissions/PermissionSettingsBridge.java",
+   "java/src/org/chromium/chrome/browser/permissions/PermissionUpdateRequester.java",
+diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/android/java/res/xml/privacy_preferences.xml
+--- a/chrome/android/java/res/xml/privacy_preferences.xml
++++ b/chrome/android/java/res/xml/privacy_preferences.xml
+@@ -84,11 +84,6 @@
+           android:title="@string/autocomplete_searches_and_urls_title"
+           android:summary="@string/autocomplete_searches_and_urls_summary"
+           android:persistent="false"/>
+-      <org.chromium.components.browser_ui.settings.ChromeSwitchPreference
+-          android:key="autofill_assistant"
+-          android:title="@string/prefs_autofill_assistant_title"
+-          android:summary="@string/prefs_autofill_assistant_summary"
+-          android:persistent="false"/>
+     </PreferenceCategory>
+     <Preference
+         android:key="phone_as_a_security_key"
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
++++ b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
+@@ -37,8 +37,6 @@ import org.chromium.chrome.browser.ui.messages.snackbar.INeedSnackbarManager;
+ import org.chromium.chrome.browser.ui.messages.snackbar.Snackbar;
+ import org.chromium.chrome.browser.ApplicationLifetime;
+ import org.chromium.chrome.browser.signin.services.IdentityServicesProvider;
+-import org.chromium.chrome.browser.autofill_assistant.AssistantFeatures;
+-import org.chromium.chrome.browser.autofill_assistant.AutofillAssistantPreferencesUtil;
+ import org.chromium.components.browser_ui.bottomsheet.BottomSheetController;
+ import org.chromium.components.browser_ui.settings.ChromeSwitchPreference;
+ import org.chromium.components.browser_ui.settings.SpinnerPreference;
+@@ -85,9 +83,7 @@ public class PrivacySettings
+     // moved from SyncAndServicesSettings.java
+     private static final String PREF_SERVICES_CATEGORY = "services_category";
+     private static final String PREF_SEARCH_SUGGESTIONS = "search_suggestions";
+-    public static final String PREF_AUTOFILL_ASSISTANT = "autofill_assistant";
+     private ChromeSwitchPreference mSearchSuggestions;
+-    private @Nullable ChromeSwitchPreference mAutofillAssistant;
+     private final SharedPreferencesManager mSharedPreferencesManager =
+             SharedPreferencesManager.getInstance();
+     private final PrefService prefService = UserPrefs.get(Profile.getLastUsedRegularProfile());
+@@ -135,18 +131,6 @@ public class PrivacySettings
+         mSearchSuggestions.setOnPreferenceChangeListener(this);
+         mSearchSuggestions.setManagedPreferenceDelegate(mManagedPreferenceDelegate);
+ 
+-        mAutofillAssistant = (ChromeSwitchPreference) findPreference(PREF_AUTOFILL_ASSISTANT);
+-        if (shouldShowAutofillAssistantPreference()) {
+-            mAutofillAssistant.setOnPreferenceChangeListener(this);
+-            mAutofillAssistant.setManagedPreferenceDelegate(mManagedPreferenceDelegate);
+-            mAutofillAssistant.setChecked(AutofillAssistantPreferencesUtil.getAssistantEnabledPreference(false));
+-        } else {
+-            PreferenceCategory servicesCategory =
+-                     (PreferenceCategory) findPreference(PREF_SERVICES_CATEGORY);
+-            servicesCategory.removePreference(mAutofillAssistant);
+-            mAutofillAssistant = null;
+-        }
+-
+         ChromeSwitchPreference canMakePaymentPref =
+                 (ChromeSwitchPreference) findPreference(PREF_CAN_MAKE_PAYMENT);
+         canMakePaymentPref.setOnPreferenceChangeListener(this);
+@@ -254,8 +238,6 @@ public class PrivacySettings
+             SharedPreferences.Editor sharedPreferencesEditor = ContextUtils.getAppSharedPreferences().edit();
+             sharedPreferencesEditor.putBoolean(PREF_OPEN_EXTERNAL_LINKS_INCOGNITO, (boolean)newValue);
+             sharedPreferencesEditor.apply();
+-        } else if (PREF_AUTOFILL_ASSISTANT.equals(key)) {
+-            AutofillAssistantPreferencesUtil.setAssistantEnabledPreference( (boolean) newValue);
+         } else if (PREF_ALWAYS_INCOGNITO.equals(key)) {
+             AlwaysIncognitoLinkInterceptor.setAlwaysIncognito((boolean) newValue);
+             if (!mSnackbarManager.isShowing())
+@@ -361,14 +343,6 @@ public class PrivacySettings
+         }
+     }
+ 
+-    /**
+-     *  This checks whether Autofill Assistant is enabled and was shown at least once (only then
+-     *  will the AA switch be assigned a value).
+-     */
+-    private boolean shouldShowAutofillAssistantPreference() {
+-        return AssistantFeatures.AUTOFILL_ASSISTANT.isEnabled();
+-    }
+-
+     @Override
+     public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+         menu.clear();
+diff --git a/chrome/android/java_sources.gni b/chrome/android/java_sources.gni
+--- a/chrome/android/java_sources.gni
++++ b/chrome/android/java_sources.gni
+@@ -6,7 +6,6 @@ import("//build/config/android/config.gni")
+ import("//chrome/android/chrome_java_sources.gni")
+ import("//chrome/android/chrome_junit_test_java_sources.gni")
+ import("//chrome/android/chrome_test_java_sources.gni")
+-import("//chrome/android/features/autofill_assistant/public/java_sources.gni")
+ import(
+     "//chrome/android/features/start_surface/internal/javatests/start_surface_test_java_sources.gni")
+ import(
+@@ -24,8 +23,6 @@ import("//components/omnibox/browser/test_java_sources.gni")
+ import("//device/vr/buildflags/buildflags.gni")
+ import("//components/user_scripts/android/java_sources.gni")
+ 
+-chrome_java_sources += public_autofill_assistant_java_sources
+-
+ if (enable_vr) {
+   chrome_java_sources += [ "java/src/org/chromium/chrome/browser/component_updater/VrAssetsComponentInstaller.java" ]
+ }
+diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
+--- a/chrome/browser/BUILD.gn
++++ b/chrome/browser/BUILD.gn
+@@ -158,26 +158,6 @@ static_library("browser") {
+     "autocomplete/remote_suggestions_service_factory.h",
+     "autocomplete/shortcuts_backend_factory.cc",
+     "autocomplete/shortcuts_backend_factory.h",
+-    "autofill/address_normalizer_factory.cc",
+-    "autofill/address_normalizer_factory.h",
+-    "autofill/autocomplete_history_manager_factory.cc",
+-    "autofill/autocomplete_history_manager_factory.h",
+-    "autofill/autofill_gstatic_reader.cc",
+-    "autofill/autofill_gstatic_reader.h",
+-    "autofill/autofill_image_fetcher_factory.cc",
+-    "autofill/autofill_image_fetcher_factory.h",
+-    "autofill/autofill_offer_manager_factory.cc",
+-    "autofill/autofill_offer_manager_factory.h",
+-    "autofill/autofill_profile_validator_factory.cc",
+-    "autofill/autofill_profile_validator_factory.h",
+-    "autofill/personal_data_manager_factory.cc",
+-    "autofill/personal_data_manager_factory.h",
+-    "autofill/risk_util.cc",
+-    "autofill/risk_util.h",
+-    "autofill/strike_database_factory.cc",
+-    "autofill/strike_database_factory.h",
+-    "autofill/validation_rules_storage_factory.cc",
+-    "autofill/validation_rules_storage_factory.h",
+     "background_fetch/background_fetch_delegate_factory.cc",
+     "background_fetch/background_fetch_delegate_factory.h",
+     "background_fetch/background_fetch_delegate_impl.cc",
+@@ -1879,14 +1859,11 @@ static_library("browser") {
+     "//chrome/common:constants",
+     "//chrome/services/file_util/public/mojom",
+     "//components/account_id",
+-    "//components/autofill/core/browser",
+     "//components/enterprise/common:download_item_reroute_info",
+     "//components/nacl/common:buildflags",
+     "//components/optimization_guide:machine_learning_tflite_buildflags",
+     "//components/page_info",
+     "//components/page_info/core",
+-    "//components/payments/core",
+-    "//components/payments/core:error_strings",
+     "//components/policy/proto",
+     "//components/safe_browsing:buildflags",
+     "//components/services/storage/public/mojom",
+@@ -1998,11 +1975,6 @@ static_library("browser") {
+     "//chrome/installer/util:with_no_strings",
+     "//chromeos/components/chromebox_for_meetings/buildflags",
+     "//components/assist_ranker",
+-    "//components/autofill/content/browser",
+-    "//components/autofill/core/browser",
+-    "//components/autofill_assistant/browser/public:public",
+-    "//components/autofill_assistant/content/browser",
+-    "//components/autofill_assistant/content/common:mojo_interfaces",
+     "//components/back_forward_cache",
+     "//components/background_fetch",
+     "//components/background_sync",
+@@ -2142,8 +2114,6 @@ static_library("browser") {
+     "//components/password_manager/content/browser",
+     "//components/password_manager/core/browser",
+     "//components/password_manager/core/common",
+-    "//components/payments/content:utils",
+-    "//components/payments/core",
+     "//components/performance_manager",
+     "//components/permissions",
+     "//components/permissions/prediction_service",
+@@ -2396,13 +2366,6 @@ static_library("browser") {
+     "//ui/webui/resources/js/browser_command:mojo_bindings",
+   ]
+ 
+-  if (is_android) {
+-    deps += [
+-        "//components/android_autofill/browser",
+-        "//components/android_autofill/browser:android"
+-    ]
+-  }
+-
+   if (is_chromeos_ash) {
+     sources += [
+       "apps/digital_goods/digital_goods_factory_impl.cc",
+@@ -2563,53 +2526,6 @@ static_library("browser") {
+       "android/android_theme_resources.h",
+       "android/autocomplete/tab_matcher_android.cc",
+       "android/autocomplete/tab_matcher_android.h",
+-      "android/autofill_assistant/annotate_dom_model_service_factory.cc",
+-      "android/autofill_assistant/annotate_dom_model_service_factory.h",
+-      "android/autofill_assistant/assistant_bottom_bar_delegate.cc",
+-      "android/autofill_assistant/assistant_bottom_bar_delegate.h",
+-      "android/autofill_assistant/assistant_collect_user_data_delegate.cc",
+-      "android/autofill_assistant/assistant_collect_user_data_delegate.h",
+-      "android/autofill_assistant/assistant_field_trial_util.h",
+-      "android/autofill_assistant/assistant_form_delegate.cc",
+-      "android/autofill_assistant/assistant_form_delegate.h",
+-      "android/autofill_assistant/assistant_generic_ui_delegate.cc",
+-      "android/autofill_assistant/assistant_generic_ui_delegate.h",
+-      "android/autofill_assistant/assistant_header_delegate.cc",
+-      "android/autofill_assistant/assistant_header_delegate.h",
+-      "android/autofill_assistant/assistant_header_model.cc",
+-      "android/autofill_assistant/assistant_header_model.h",
+-      "android/autofill_assistant/assistant_overlay_delegate.cc",
+-      "android/autofill_assistant/assistant_overlay_delegate.h",
+-      "android/autofill_assistant/client_android.cc",
+-      "android/autofill_assistant/client_android.h",
+-      "android/autofill_assistant/dependencies.cc",
+-      "android/autofill_assistant/dependencies.h",
+-      "android/autofill_assistant/dependencies_chrome.cc",
+-      "android/autofill_assistant/dependencies_chrome.h",
+-      "android/autofill_assistant/features_android.cc",
+-      "android/autofill_assistant/generic_ui_events_android.cc",
+-      "android/autofill_assistant/generic_ui_events_android.h",
+-      "android/autofill_assistant/generic_ui_interactions_android.cc",
+-      "android/autofill_assistant/generic_ui_interactions_android.h",
+-      "android/autofill_assistant/generic_ui_nested_controller_android.cc",
+-      "android/autofill_assistant/generic_ui_nested_controller_android.h",
+-      "android/autofill_assistant/generic_ui_root_controller_android.cc",
+-      "android/autofill_assistant/generic_ui_root_controller_android.h",
+-      "android/autofill_assistant/interaction_handler_android.cc",
+-      "android/autofill_assistant/interaction_handler_android.h",
+-      "android/autofill_assistant/onboarding_coordinator_bridge.cc",
+-      "android/autofill_assistant/onboarding_fetcher_factory.cc",
+-      "android/autofill_assistant/onboarding_fetcher_factory.h",
+-      "android/autofill_assistant/starter_android.cc",
+-      "android/autofill_assistant/starter_android.h",
+-      "android/autofill_assistant/trigger_script_bridge_android.cc",
+-      "android/autofill_assistant/trigger_script_bridge_android.h",
+-      "android/autofill_assistant/ui_controller_android.cc",
+-      "android/autofill_assistant/ui_controller_android.h",
+-      "android/autofill_assistant/ui_controller_android_utils.cc",
+-      "android/autofill_assistant/ui_controller_android_utils.h",
+-      "android/autofill_assistant/view_handler_android.cc",
+-      "android/autofill_assistant/view_handler_android.h",
+       "android/background_sync_launcher_android.cc",
+       "android/background_sync_launcher_android.h",
+       "android/background_tab_manager.cc",
+@@ -2850,8 +2766,6 @@ static_library("browser") {
+       "android/permissions/permission_settings_bridge.cc",
+       "android/policy/policy_auditor.cc",
+       "android/preferences/about_settings_bridge.cc",
+-      "android/preferences/autofill/autofill_profile_bridge.cc",
+-      "android/preferences/autofill/autofill_profile_bridge.h",
+       "android/preferences/browser_prefs_android.cc",
+       "android/preferences/browser_prefs_android.h",
+       "android/preferences/clipboard_android.cc",
+@@ -2959,31 +2873,6 @@ static_library("browser") {
+       "android/webapps/webapp_registry.h",
+       "attribution_reporting/background_attribution_flusher.cc",
+       "attribution_reporting/background_attribution_flusher.h",
+-      "autofill/accessory_controller.h",
+-      "autofill/address_accessory_controller.h",
+-      "autofill/address_accessory_controller_impl.cc",
+-      "autofill/address_accessory_controller_impl.h",
+-      "autofill/android/personal_data_manager_android.cc",
+-      "autofill/android/personal_data_manager_android.h",
+-      "autofill/android/phone_number_util_android.cc",
+-      "autofill/android/save_update_address_profile_flow_manager.cc",
+-      "autofill/android/save_update_address_profile_flow_manager.h",
+-      "autofill/android/save_update_address_profile_message_controller.cc",
+-      "autofill/android/save_update_address_profile_message_controller.h",
+-      "autofill/android/save_update_address_profile_prompt_controller.cc",
+-      "autofill/android/save_update_address_profile_prompt_controller.h",
+-      "autofill/android/save_update_address_profile_prompt_view.h",
+-      "autofill/autofill_keyboard_accessory_adapter.cc",
+-      "autofill/autofill_keyboard_accessory_adapter.h",
+-      "autofill/credit_card_accessory_controller.h",
+-      "autofill/credit_card_accessory_controller_impl.cc",
+-      "autofill/credit_card_accessory_controller_impl.h",
+-      "autofill/manual_filling_controller.h",
+-      "autofill/manual_filling_controller_impl.cc",
+-      "autofill/manual_filling_controller_impl.h",
+-      "autofill/manual_filling_utils.cc",
+-      "autofill/manual_filling_utils.h",
+-      "autofill/manual_filling_view_interface.h",
+       "banners/android/chrome_app_banner_manager_android.cc",
+       "banners/android/chrome_app_banner_manager_android.h",
+       "bookmarks/bookmark_html_writer.cc",
+@@ -3217,7 +3106,6 @@ static_library("browser") {
+       "password_manager/android/update_password_infobar_delegate_android.h",
+       "password_manager/password_scripts_fetcher_factory.cc",
+       "password_manager/password_scripts_fetcher_factory.h",
+-      "payments/android/service_worker_payment_app_bridge.cc",
+       "permissions/grouped_permission_infobar_delegate_android.cc",
+       "permissions/grouped_permission_infobar_delegate_android.h",
+       "permissions/notification_blocked_dialog_controller_android.cc",
+@@ -3357,7 +3245,6 @@ static_library("browser") {
+       "//chrome/browser/password_edit_dialog/android",
+       "//chrome/browser/password_entry_edit/android",
+       "//chrome/browser/password_manager/android:jni_headers",
+-      "//chrome/browser/payments/android:jni_headers",
+       "//chrome/browser/policy/android:android",
+       "//chrome/browser/policy/android:jni_headers",
+       "//chrome/browser/power_bookmarks",
+@@ -3378,9 +3265,6 @@ static_library("browser") {
+       "//chrome/common:non_code_constants",
+       "//chrome/services/media_gallery_util/public/cpp",
+       "//components/assist_ranker/proto",
+-      "//components/autofill_assistant/browser",
+-      "//components/autofill_assistant/browser:proto",
+-      "//components/autofill_assistant/content/browser",
+       "//components/background_sync",
+       "//components/bookmarks/common/android",
+       "//components/browser_ui/contacts_picker/android",
+@@ -3438,9 +3322,6 @@ static_library("browser") {
+       "//components/password_manager/core/browser:affiliation",
+       "//components/password_manager/core/browser/form_parsing:form_parsing",
+       "//components/password_manager/core/browser/leak_detection",
+-      "//components/payments/content",
+-      "//components/payments/content/android",
+-      "//components/payments/content/android:jni_headers",
+       "//components/permissions/android:native",
+       "//components/power_scheduler",
+       "//components/query_tiles",
+@@ -6081,12 +5962,6 @@ static_library("browser") {
+       "media/cast_mirroring_service_host.h",
+       "media/offscreen_tab.cc",
+       "media/offscreen_tab.h",
+-      "payments/chrome_payment_request_delegate.cc",
+-      "payments/chrome_payment_request_delegate.h",
+-      "payments/payment_request_display_manager_factory.cc",
+-      "payments/payment_request_display_manager_factory.h",
+-      "payments/payment_request_factory.cc",
+-      "payments/payment_request_factory.h",
+     ]
+     deps += [
+       "//chrome/browser/ui/webui/discards:mojo_bindings",
+@@ -6095,8 +5970,6 @@ static_library("browser") {
+       "//components/mirroring/mojom:host",
+       "//components/mirroring/mojom:service",
+       "//components/mirroring/service:mirroring_service",
+-      "//components/payments/content",
+-      "//components/payments/content:utils",
+       "//components/webauthn/content/browser",
+       "//media/cast:net",
+     ]
+@@ -7572,14 +7445,6 @@ static_library("test_support") {
+ 
+   if (is_android) {
+     sources += [
+-      "autofill/mock_address_accessory_controller.cc",
+-      "autofill/mock_address_accessory_controller.h",
+-      "autofill/mock_credit_card_accessory_controller.cc",
+-      "autofill/mock_credit_card_accessory_controller.h",
+-      "autofill/mock_manual_filling_view.cc",
+-      "autofill/mock_manual_filling_view.h",
+-      "autofill/mock_password_accessory_controller.cc",
+-      "autofill/mock_password_accessory_controller.h",
+       "download/android/mock_download_controller.cc",
+       "download/android/mock_download_controller.h",
+     ]
+diff --git a/chrome/browser/preferences/BUILD.gn b/chrome/browser/preferences/BUILD.gn
+--- a/chrome/browser/preferences/BUILD.gn
++++ b/chrome/browser/preferences/BUILD.gn
+@@ -28,7 +28,6 @@ android_library("java") {
+ java_cpp_strings("java_pref_names_srcjar") {
+   sources = [
+     "//chrome/common/pref_names.cc",
+-    "//components/autofill/core/common/autofill_prefs.cc",
+     "//components/dom_distiller/core/pref_names.cc",
+     "//components/embedder_support/pref_names.cc",
+     "//components/feed/core/common/pref_names.cc",
+@@ -36,7 +35,6 @@ java_cpp_strings("java_pref_names_srcjar") {
+     "//components/language/core/browser/pref_names.cc",
+     "//components/offline_pages/core/prefetch/prefetch_prefs.cc",
+     "//components/password_manager/core/common/password_manager_pref_names.cc",
+-    "//components/payments/core/payment_prefs.cc",
+     "//components/safe_browsing/core/common/safe_browsing_prefs.cc",
+     "//components/signin/public/base/signin_pref_names.cc",
+     "//components/translate/core/browser/translate_pref_names.cc",
+diff --git a/chrome/browser/resources/settings/settings.gni b/chrome/browser/resources/settings/settings.gni
+--- a/chrome/browser/resources/settings/settings.gni
++++ b/chrome/browser/resources/settings/settings.gni
+@@ -29,31 +29,6 @@ web_component_files = [
+   "appearance_page/appearance_fonts_page.ts",
+   "appearance_page/appearance_page.ts",
+   "appearance_page/home_url_input.ts",
+-  "autofill_page/address_edit_dialog.ts",
+-  "autofill_page/address_remove_confirmation_dialog.ts",
+-  "autofill_page/autofill_page.ts",
+-  "autofill_page/avatar_icon.ts",
+-  "autofill_page/autofill_section.ts",
+-  "autofill_page/passwords_list_handler.ts",
+-  "autofill_page/credit_card_edit_dialog.ts",
+-  "autofill_page/credit_card_list_entry.ts",
+-  "autofill_page/password_check_edit_dialog.ts",
+-  "autofill_page/password_check_edit_disclaimer_dialog.ts",
+-  "autofill_page/password_check_list_item.ts",
+-  "autofill_page/password_check.ts",
+-  "autofill_page/password_edit_dialog.ts",
+-  "autofill_page/password_remove_dialog.ts",
+-  "autofill_page/password_list_item.ts",
+-  "autofill_page/password_move_multiple_passwords_to_account_dialog.ts",
+-  "autofill_page/password_move_to_account_dialog.ts",
+-  "autofill_page/password_remove_confirmation_dialog.ts",
+-  "autofill_page/passwords_export_dialog.ts",
+-  "autofill_page/passwords_section.ts",
+-  "autofill_page/passwords_device_section.ts",
+-  "autofill_page/passwords_shared_css.ts",
+-  "autofill_page/payments_list.ts",
+-  "autofill_page/payments_section.ts",
+-  "autofill_page/upi_id_list_entry.ts",
+   "basic_page/basic_page.ts",
+   "clear_browsing_data_dialog/clear_browsing_data_dialog.ts",
+   "clear_browsing_data_dialog/history_deletion_dialog.ts",
+@@ -205,16 +180,6 @@ non_webcomponent_files = [
+   "about_page/about_page_browser_proxy.ts",
+   "appearance_page/appearance_browser_proxy.ts",
+   "appearance_page/fonts_browser_proxy.ts",
+-  "autofill_page/autofill_manager_proxy.ts",
+-  "autofill_page/merge_exceptions_store_copies_mixin.ts",
+-  "autofill_page/merge_passwords_store_copies_mixin.ts",
+-  "autofill_page/multi_store_exception_entry.ts",
+-  "autofill_page/multi_store_id_handler.ts",
+-  "autofill_page/multi_store_password_ui_entry.ts",
+-  "autofill_page/password_check_mixin.ts",
+-  "autofill_page/password_manager_proxy.ts",
+-  "autofill_page/payments_manager_proxy.ts",
+-  "autofill_page/show_password_mixin.ts",
+   "base_mixin.ts",
+   "clear_browsing_data_dialog/clear_browsing_data_browser_proxy.ts",
+   "controls/cr_policy_pref_mixin.ts",
+@@ -264,10 +229,6 @@ non_webcomponent_files = [
+   "site_settings/website_usage_browser_proxy.ts",
+ ]
+ 
+-if (is_chromeos_ash || is_chromeos_lacros) {
+-  non_webcomponent_files += [ "autofill_page/blocking_request_manager.ts" ]
+-}
+-
+ if (is_chromeos_ash) {
+   non_webcomponent_files += [
+     "people_page/account_manager_browser_proxy.ts",
+diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn
+--- a/chrome/browser/ui/BUILD.gn
++++ b/chrome/browser/ui/BUILD.gn
+@@ -39,48 +39,6 @@ static_library("ui") {
+     "app_list/app_list_util.h",
+ 
+     # All other browser/ui/app_list files go under is_chromeos_ash below.
+-    "autofill/autofill_bubble_handler.h",
+-    "autofill/autofill_popup_controller.h",
+-    "autofill/autofill_popup_controller_impl.cc",
+-    "autofill/autofill_popup_controller_impl.h",
+-    "autofill/autofill_popup_controller_utils.cc",
+-    "autofill/autofill_popup_controller_utils.h",
+-    "autofill/autofill_popup_view.h",
+-    "autofill/autofill_popup_view_delegate.h",
+-    "autofill/chrome_autofill_client.cc",
+-    "autofill/chrome_autofill_client.h",
+-    "autofill/payments/autofill_dialog_models.cc",
+-    "autofill/payments/autofill_dialog_models.h",
+-    "autofill/payments/autofill_error_dialog_controller.h",
+-    "autofill/payments/autofill_error_dialog_controller_impl.cc",
+-    "autofill/payments/autofill_error_dialog_controller_impl.h",
+-    "autofill/payments/autofill_error_dialog_view.h",
+-    "autofill/payments/autofill_progress_dialog_controller.h",
+-    "autofill/payments/autofill_progress_dialog_controller_impl.cc",
+-    "autofill/payments/autofill_progress_dialog_controller_impl.h",
+-    "autofill/payments/autofill_progress_dialog_view.h",
+-    "autofill/payments/card_unmask_authentication_selection_dialog_controller.h",
+-    "autofill/payments/card_unmask_authentication_selection_dialog_controller_impl.cc",
+-    "autofill/payments/card_unmask_authentication_selection_dialog_controller_impl.h",
+-    "autofill/payments/card_unmask_authentication_selection_dialog_view.h",
+-    "autofill/payments/card_unmask_otp_input_dialog_controller.h",
+-    "autofill/payments/card_unmask_otp_input_dialog_controller_impl.cc",
+-    "autofill/payments/card_unmask_otp_input_dialog_controller_impl.h",
+-    "autofill/payments/card_unmask_otp_input_dialog_view.h",
+-    "autofill/payments/create_card_unmask_prompt_view.h",
+-    "autofill/payments/credit_card_scanner_controller.cc",
+-    "autofill/payments/credit_card_scanner_controller.h",
+-    "autofill/payments/credit_card_scanner_view.cc",
+-    "autofill/payments/credit_card_scanner_view.h",
+-    "autofill/payments/credit_card_scanner_view_delegate.h",
+-    "autofill/payments/offer_notification_helper.cc",
+-    "autofill/payments/offer_notification_helper.h",
+-    "autofill/payments/payments_ui_constants.h",
+-    "autofill/popup_constants.h",
+-    "autofill/popup_controller_common.cc",
+-    "autofill/popup_controller_common.h",
+-    "autofill/test/test_autofill_bubble_handler.cc",
+-    "autofill/test/test_autofill_bubble_handler.h",
+     "blocked_content/blocked_window_params.cc",
+     "blocked_content/blocked_window_params.h",
+     "blocked_content/chrome_popup_navigation_delegate.cc",
+@@ -216,12 +174,6 @@ static_library("ui") {
+     "webid/webid_dialog.h",
+     "webui/about_ui.cc",
+     "webui/about_ui.h",
+-    "webui/autofill_and_password_manager_internals/autofill_internals_ui.cc",
+-    "webui/autofill_and_password_manager_internals/autofill_internals_ui.h",
+-    "webui/autofill_and_password_manager_internals/internals_ui_handler.cc",
+-    "webui/autofill_and_password_manager_internals/internals_ui_handler.h",
+-    "webui/autofill_and_password_manager_internals/password_manager_internals_ui.cc",
+-    "webui/autofill_and_password_manager_internals/password_manager_internals_ui.h",
+     "webui/chrome_untrusted_web_ui_controller_factory.cc",
+     "webui/chrome_untrusted_web_ui_controller_factory.h",
+     "webui/chrome_web_ui_controller_factory.cc",
+@@ -450,9 +402,6 @@ static_library("ui") {
+     "//components/about_ui",
+     "//components/account_id",
+     "//components/accuracy_tips",
+-    "//components/autofill/content/browser:risk_proto",
+-    "//components/autofill/core/browser",
+-    "//components/autofill_assistant/browser/public:public",
+     "//components/blocked_content",
+     "//components/bookmarks/browser",
+     "//components/bookmarks/managed",
+@@ -528,9 +477,6 @@ static_library("ui") {
+     "//components/password_manager/core/browser",
+     "//components/password_manager/core/browser:affiliation",
+     "//components/password_manager/core/browser:csv",
+-    "//components/payments/content:utils",
+-    "//components/payments/content/icon",
+-    "//components/payments/core:error_strings",
+     "//components/performance_manager",
+     "//components/permissions",
+     "//components/policy/core/browser",
+@@ -711,39 +657,6 @@ static_library("ui") {
+     sources += [
+       "android/android_about_app_info.cc",
+       "android/android_about_app_info.h",
+-      "android/autofill/authenticator_selection_dialog_view_android.cc",
+-      "android/autofill/authenticator_selection_dialog_view_android.h",
+-      "android/autofill/autofill_error_dialog_view_android.cc",
+-      "android/autofill/autofill_error_dialog_view_android.h",
+-      "android/autofill/autofill_keyboard_accessory_view.cc",
+-      "android/autofill/autofill_keyboard_accessory_view.h",
+-      "android/autofill/autofill_logger_android.cc",
+-      "android/autofill/autofill_logger_android.h",
+-      "android/autofill/autofill_popup_view_android.cc",
+-      "android/autofill/autofill_popup_view_android.h",
+-      "android/autofill/autofill_progress_dialog_view_android.cc",
+-      "android/autofill/autofill_progress_dialog_view_android.h",
+-      "android/autofill/card_expiration_date_fix_flow_view_android.cc",
+-      "android/autofill/card_expiration_date_fix_flow_view_android.h",
+-      "android/autofill/card_name_fix_flow_view_android.cc",
+-      "android/autofill/card_name_fix_flow_view_android.h",
+-      "android/autofill/card_unmask_prompt_view_android.cc",
+-      "android/autofill/card_unmask_prompt_view_android.h",
+-      "android/autofill/credit_card_scanner_view_android.cc",
+-      "android/autofill/credit_card_scanner_view_android.h",
+-      "android/autofill/otp_verification_dialog_view_android.cc",
+-      "android/autofill/otp_verification_dialog_view_android.h",
+-      "android/autofill/save_card_controller_metrics_android.cc",
+-      "android/autofill/save_card_controller_metrics_android.h",
+-      "android/autofill/save_card_message_confirm_controller.cc",
+-      "android/autofill/save_card_message_confirm_controller.h",
+-      "android/autofill/save_card_message_confirm_delegate.h",
+-      "android/autofill/save_card_message_controller_android.cc",
+-      "android/autofill/save_card_message_controller_android.h",
+-      "android/autofill/save_update_address_profile_prompt_view_android.cc",
+-      "android/autofill/save_update_address_profile_prompt_view_android.h",
+-      "android/autofill/snackbar/autofill_snackbar_view_android.cc",
+-      "android/autofill/snackbar/autofill_snackbar_view_android.h",
+       "android/chrome_http_auth_handler.cc",
+       "android/chrome_http_auth_handler.h",
+       "android/chrome_javascript_app_modal_dialog_android.cc",
+@@ -756,12 +669,6 @@ static_library("ui") {
+       "android/device_dialog/usb_chooser_dialog_android.cc",
+       "android/device_dialog/usb_chooser_dialog_android.h",
+       "android/external_protocol_dialog_android.cc",
+-      "android/infobars/autofill_credit_card_filling_infobar.cc",
+-      "android/infobars/autofill_credit_card_filling_infobar.h",
+-      "android/infobars/autofill_offer_notification_infobar.cc",
+-      "android/infobars/autofill_offer_notification_infobar.h",
+-      "android/infobars/autofill_save_card_infobar.cc",
+-      "android/infobars/autofill_save_card_infobar.h",
+       "android/infobars/download_progress_infobar.cc",
+       "android/infobars/download_progress_infobar.h",
+       "android/infobars/duplicate_download_infobar.cc",
+@@ -838,12 +745,6 @@ static_library("ui") {
+       "android/webid/account_selection_view_android.cc",
+       "android/webid/account_selection_view_android.h",
+       "android/webid/webid_dialog_android.cc",
+-      "autofill/payments/autofill_snackbar_controller.h",
+-      "autofill/payments/autofill_snackbar_controller_impl.cc",
+-      "autofill/payments/autofill_snackbar_controller_impl.h",
+-      "autofill/payments/autofill_snackbar_view.h",
+-      "autofill/payments/offer_notification_infobar_controller_impl.cc",
+-      "autofill/payments/offer_notification_infobar_controller_impl.h",
+       "browser_otr_state_android.cc",
+       "javascript_dialogs/javascript_tab_modal_dialog_manager_delegate_android.cc",
+       "javascript_dialogs/javascript_tab_modal_dialog_manager_delegate_android.h",
+@@ -888,7 +789,6 @@ static_library("ui") {
+       "//chrome/browser/image_decoder",
+       "//chrome/browser/notifications/scheduler/public",
+       "//chrome/browser/resources/webapks:resources",
+-      "//chrome/browser/ui/android/autofill/internal:jni_headers",
+       "//chrome/browser/ui/webui/explore_sites_internals:mojo_bindings",
+       "//chrome/browser/ui/webui/feed_internals:mojo_bindings",
+       "//components/browser_ui/client_certificate/android",
+@@ -3184,18 +3084,6 @@ static_library("ui") {
+ 
+   if (is_win || is_mac || is_linux || is_chromeos || is_fuchsia) {
+     sources += [
+-      "autofill/payments/virtual_card_selection_dialog_controller.h",
+-      "autofill/payments/virtual_card_selection_dialog_controller_impl.cc",
+-      "autofill/payments/virtual_card_selection_dialog_controller_impl.h",
+-      "autofill/payments/virtual_card_selection_dialog_view.h",
+-      "autofill/payments/webauthn_dialog_controller.h",
+-      "autofill/payments/webauthn_dialog_controller_impl.cc",
+-      "autofill/payments/webauthn_dialog_controller_impl.h",
+-      "autofill/payments/webauthn_dialog_model.cc",
+-      "autofill/payments/webauthn_dialog_model.h",
+-      "autofill/payments/webauthn_dialog_model_observer.h",
+-      "autofill/payments/webauthn_dialog_state.h",
+-      "autofill/payments/webauthn_dialog_view.h",
+       "browser_dialogs_desktop.cc",
+       "frame/window_frame_util.cc",
+       "frame/window_frame_util.h",
+@@ -3213,10 +3101,6 @@ static_library("ui") {
+       "tab_contents/chrome_web_contents_menu_helper.h",
+       "tab_contents/chrome_web_contents_view_handle_drop.cc",
+       "tab_contents/chrome_web_contents_view_handle_drop.h",
+-      "views/autofill/payments/virtual_card_selection_dialog_view_impl.cc",
+-      "views/autofill/payments/virtual_card_selection_dialog_view_impl.h",
+-      "views/autofill/payments/webauthn_dialog_view_impl.cc",
+-      "views/autofill/payments/webauthn_dialog_view_impl.h",
+       "views/close_bubble_on_tab_activation_helper.cc",
+       "views/close_bubble_on_tab_activation_helper.h",
+       "views/external_protocol_dialog.cc",
+@@ -3414,8 +3298,6 @@ static_library("ui") {
+ 
+   if (is_mac) {
+     sources += [
+-      "autofill/autofill_popup_controller_impl_mac.h",
+-      "autofill/autofill_popup_controller_impl_mac.mm",
+       "browser_commands_mac.h",
+       "browser_commands_mac.mm",
+       "browser_mac.cc",
+@@ -3849,45 +3731,6 @@ static_library("ui") {
+ 
+   if (toolkit_views) {
+     sources += [
+-      "autofill/address_editor_controller.cc",
+-      "autofill/address_editor_controller.h",
+-      "autofill/autofill_bubble_base.h",
+-      "autofill/autofill_bubble_controller_base.cc",
+-      "autofill/autofill_bubble_controller_base.h",
+-      "autofill/edit_address_profile_dialog_controller.h",
+-      "autofill/edit_address_profile_dialog_controller_impl.cc",
+-      "autofill/edit_address_profile_dialog_controller_impl.h",
+-      "autofill/payments/local_card_migration_bubble_controller_impl.cc",
+-      "autofill/payments/local_card_migration_bubble_controller_impl.h",
+-      "autofill/payments/local_card_migration_controller_observer.h",
+-      "autofill/payments/local_card_migration_dialog.h",
+-      "autofill/payments/local_card_migration_dialog_controller_impl.cc",
+-      "autofill/payments/local_card_migration_dialog_controller_impl.h",
+-      "autofill/payments/local_card_migration_dialog_factory.h",
+-      "autofill/payments/local_card_migration_dialog_state.h",
+-      "autofill/payments/manage_migration_ui_controller.cc",
+-      "autofill/payments/manage_migration_ui_controller.h",
+-      "autofill/payments/offer_notification_bubble_controller.h",
+-      "autofill/payments/offer_notification_bubble_controller_impl.cc",
+-      "autofill/payments/offer_notification_bubble_controller_impl.h",
+-      "autofill/payments/save_card_bubble_controller.h",
+-      "autofill/payments/save_card_bubble_controller_impl.cc",
+-      "autofill/payments/save_card_bubble_controller_impl.h",
+-      "autofill/payments/save_card_ui.h",
+-      "autofill/payments/save_payment_icon_controller.cc",
+-      "autofill/payments/save_payment_icon_controller.h",
+-      "autofill/payments/save_upi_bubble.h",
+-      "autofill/payments/save_upi_bubble_controller.h",
+-      "autofill/payments/save_upi_bubble_controller_impl.cc",
+-      "autofill/payments/save_upi_bubble_controller_impl.h",
+-      "autofill/payments/virtual_card_manual_fallback_bubble_controller.h",
+-      "autofill/payments/virtual_card_manual_fallback_bubble_controller_impl.cc",
+-      "autofill/payments/virtual_card_manual_fallback_bubble_controller_impl.h",
+-      "autofill/save_update_address_profile_bubble_controller.h",
+-      "autofill/save_update_address_profile_bubble_controller_impl.cc",
+-      "autofill/save_update_address_profile_bubble_controller_impl.h",
+-      "autofill/save_update_address_profile_icon_controller.cc",
+-      "autofill/save_update_address_profile_icon_controller.h",
+       "bubble_anchor_util.h",
+       "qrcode_generator/qrcode_generator_bubble_controller.cc",
+       "qrcode_generator/qrcode_generator_bubble_controller.h",
+@@ -3937,69 +3780,6 @@ static_library("ui") {
+       "views/apps/app_info_dialog/app_info_summary_panel.h",
+       "views/apps/chrome_native_app_window_views.cc",
+       "views/apps/chrome_native_app_window_views.h",
+-      "views/autofill/address_editor_view.cc",
+-      "views/autofill/address_editor_view.h",
+-      "views/autofill/autofill_bubble_handler_impl.cc",
+-      "views/autofill/autofill_bubble_handler_impl.h",
+-      "views/autofill/autofill_popup_base_view.cc",
+-      "views/autofill/autofill_popup_base_view.h",
+-      "views/autofill/autofill_popup_view_native_views.cc",
+-      "views/autofill/autofill_popup_view_native_views.h",
+-      "views/autofill/autofill_popup_view_utils.cc",
+-      "views/autofill/autofill_popup_view_utils.h",
+-      "views/autofill/edit_address_profile_view.cc",
+-      "views/autofill/edit_address_profile_view.h",
+-      "views/autofill/payments/autofill_error_dialog_view_native_views.cc",
+-      "views/autofill/payments/autofill_error_dialog_view_native_views.h",
+-      "views/autofill/payments/autofill_progress_dialog_views.cc",
+-      "views/autofill/payments/autofill_progress_dialog_views.h",
+-      "views/autofill/payments/card_unmask_authentication_selection_dialog_views.cc",
+-      "views/autofill/payments/card_unmask_authentication_selection_dialog_views.h",
+-      "views/autofill/payments/card_unmask_otp_input_dialog_views.cc",
+-      "views/autofill/payments/card_unmask_otp_input_dialog_views.h",
+-      "views/autofill/payments/card_unmask_prompt_views.cc",
+-      "views/autofill/payments/card_unmask_prompt_views.h",
+-      "views/autofill/payments/dialog_view_ids.h",
+-      "views/autofill/payments/local_card_migration_bubble_views.cc",
+-      "views/autofill/payments/local_card_migration_bubble_views.h",
+-      "views/autofill/payments/local_card_migration_dialog_view.cc",
+-      "views/autofill/payments/local_card_migration_dialog_view.h",
+-      "views/autofill/payments/local_card_migration_error_dialog_view.cc",
+-      "views/autofill/payments/local_card_migration_error_dialog_view.h",
+-      "views/autofill/payments/local_card_migration_icon_view.cc",
+-      "views/autofill/payments/local_card_migration_icon_view.h",
+-      "views/autofill/payments/migratable_card_view.cc",
+-      "views/autofill/payments/migratable_card_view.h",
+-      "views/autofill/payments/offer_notification_bubble_views.cc",
+-      "views/autofill/payments/offer_notification_bubble_views.h",
+-      "views/autofill/payments/offer_notification_icon_view.cc",
+-      "views/autofill/payments/offer_notification_icon_view.h",
+-      "views/autofill/payments/payments_view_util.cc",
+-      "views/autofill/payments/payments_view_util.h",
+-      "views/autofill/payments/promo_code_label_button.cc",
+-      "views/autofill/payments/promo_code_label_button.h",
+-      "views/autofill/payments/save_card_bubble_views.cc",
+-      "views/autofill/payments/save_card_bubble_views.h",
+-      "views/autofill/payments/save_card_failure_bubble_views.cc",
+-      "views/autofill/payments/save_card_failure_bubble_views.h",
+-      "views/autofill/payments/save_card_manage_cards_bubble_views.cc",
+-      "views/autofill/payments/save_card_manage_cards_bubble_views.h",
+-      "views/autofill/payments/save_card_offer_bubble_views.cc",
+-      "views/autofill/payments/save_card_offer_bubble_views.h",
+-      "views/autofill/payments/save_payment_icon_view.cc",
+-      "views/autofill/payments/save_payment_icon_view.h",
+-      "views/autofill/payments/save_upi_offer_bubble_views.cc",
+-      "views/autofill/payments/save_upi_offer_bubble_views.h",
+-      "views/autofill/payments/virtual_card_manual_fallback_bubble_views.cc",
+-      "views/autofill/payments/virtual_card_manual_fallback_bubble_views.h",
+-      "views/autofill/payments/virtual_card_manual_fallback_icon_view.cc",
+-      "views/autofill/payments/virtual_card_manual_fallback_icon_view.h",
+-      "views/autofill/save_address_profile_view.cc",
+-      "views/autofill/save_address_profile_view.h",
+-      "views/autofill/save_update_address_profile_icon_view.cc",
+-      "views/autofill/save_update_address_profile_icon_view.h",
+-      "views/autofill/update_address_profile_view.cc",
+-      "views/autofill/update_address_profile_view.h",
+       "views/bookmarks/bookmark_bar_view.cc",
+       "views/bookmarks/bookmark_bar_view.h",
+       "views/bookmarks/bookmark_bar_view_observer.h",
+@@ -4435,57 +4215,6 @@ static_library("ui") {
+       "views/passwords/password_save_update_view.h",
+       "views/passwords/post_save_compromised_bubble_view.cc",
+       "views/passwords/post_save_compromised_bubble_view.h",
+-      "views/payments/contact_info_editor_view_controller.cc",
+-      "views/payments/contact_info_editor_view_controller.h",
+-      "views/payments/credit_card_editor_view_controller.cc",
+-      "views/payments/credit_card_editor_view_controller.h",
+-      "views/payments/cvc_unmask_view_controller.cc",
+-      "views/payments/cvc_unmask_view_controller.h",
+-      "views/payments/editor_view_controller.cc",
+-      "views/payments/editor_view_controller.h",
+-      "views/payments/error_message_view_controller.cc",
+-      "views/payments/error_message_view_controller.h",
+-      "views/payments/order_summary_view_controller.cc",
+-      "views/payments/order_summary_view_controller.h",
+-      "views/payments/payment_handler_modal_dialog_manager_delegate.cc",
+-      "views/payments/payment_handler_modal_dialog_manager_delegate.h",
+-      "views/payments/payment_handler_web_flow_view_controller.cc",
+-      "views/payments/payment_handler_web_flow_view_controller.h",
+-      "views/payments/payment_method_view_controller.cc",
+-      "views/payments/payment_method_view_controller.h",
+-      "views/payments/payment_request_dialog_view.cc",
+-      "views/payments/payment_request_dialog_view.h",
+-      "views/payments/payment_request_dialog_view_ids.h",
+-      "views/payments/payment_request_item_list.cc",
+-      "views/payments/payment_request_item_list.h",
+-      "views/payments/payment_request_row_view.cc",
+-      "views/payments/payment_request_row_view.h",
+-      "views/payments/payment_request_sheet_controller.cc",
+-      "views/payments/payment_request_sheet_controller.h",
+-      "views/payments/payment_request_views_util.cc",
+-      "views/payments/payment_request_views_util.h",
+-      "views/payments/payment_sheet_view_controller.cc",
+-      "views/payments/payment_sheet_view_controller.h",
+-      "views/payments/profile_list_view_controller.cc",
+-      "views/payments/profile_list_view_controller.h",
+-      "views/payments/secure_payment_confirmation_dialog_view.cc",
+-      "views/payments/secure_payment_confirmation_dialog_view.h",
+-      "views/payments/secure_payment_confirmation_no_creds_dialog_view.cc",
+-      "views/payments/secure_payment_confirmation_no_creds_dialog_view.h",
+-      "views/payments/secure_payment_confirmation_views_util.cc",
+-      "views/payments/secure_payment_confirmation_views_util.h",
+-      "views/payments/shipping_address_editor_view_controller.cc",
+-      "views/payments/shipping_address_editor_view_controller.h",
+-      "views/payments/shipping_option_view_controller.cc",
+-      "views/payments/shipping_option_view_controller.h",
+-      "views/payments/validating_combobox.cc",
+-      "views/payments/validating_combobox.h",
+-      "views/payments/validating_textfield.cc",
+-      "views/payments/validating_textfield.h",
+-      "views/payments/validation_delegate.cc",
+-      "views/payments/validation_delegate.h",
+-      "views/payments/view_stack.cc",
+-      "views/payments/view_stack.h",
+       "views/permission_bubble/chooser_bubble_ui.cc",
+       "views/permission_bubble/permission_prompt_bubble_view.cc",
+       "views/permission_bubble/permission_prompt_bubble_view.h",
+@@ -4815,9 +4544,6 @@ static_library("ui") {
+       "//components/page_info",
+       "//components/page_info/core",
+       "//components/page_info/core:proto",
+-      "//components/payments/content",
+-      "//components/payments/content:utils",
+-      "//components/payments/core",
+       "//components/qr_code_generator",
+       "//components/reading_list/features:flags",
+       "//components/services/app_service/public/cpp:intents",
+@@ -5399,7 +5125,6 @@ static_library("test_support") {
+     "//chrome/browser/profiles:profile",
+     "//components/omnibox/browser",
+     "//components/password_manager/core/browser",
+-    "//components/payments/content",
+     "//components/permissions",
+     "//components/sessions",
+     "//components/translate/content/browser",
+@@ -5437,10 +5162,6 @@ static_library("test_support") {
+       "views/extensions/extensions_menu_test_util.cc",
+       "views/extensions/extensions_menu_test_util.h",
+       "views/find_bar_host_unittest_util_views.cc",
+-      "views/payments/test_chrome_payment_request_delegate.cc",
+-      "views/payments/test_chrome_payment_request_delegate.h",
+-      "views/payments/test_secure_payment_confirmation_payment_request_delegate.cc",
+-      "views/payments/test_secure_payment_confirmation_payment_request_delegate.h",
+       "views/webauthn/authenticator_request_dialog_view_test_api.cc",
+       "views/webauthn/authenticator_request_dialog_view_test_api.h",
+     ]
+diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd
+--- a/chrome/browser/ui/android/strings/android_chrome_strings.grd
++++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd
+@@ -518,75 +518,6 @@ CHAR_LIMIT guidelines:
+       <message name="IDS_PAYMENT_APPS_USAGE_MESSAGE" desc="Message to explain the usage of the listed payment apps.">
+         On some websites, you can pay with above supported payment apps on your device.
+       </message>
+-      <message name="IDS_AUTOFILL_CREATE_PROFILE" desc="Button that allows the user to create a new profile (which contains the user's name, address, etc) that will be automatically filled into web page forms. [CHAR_LIMIT=32]">
+-        Add address
+-      </message>
+-      <message name="IDS_AUTOFILL_CREATE_CREDIT_CARD" desc="Button that allows the user to add a new card that will be automatically filled into web page forms. This can be either credit, debit, or prepaid card. [CHAR_LIMIT=32]">
+-        Add card
+-      </message>
+-      <message name="IDS_AUTOFILL_EDIT_CREDIT_CARD" desc="Button that allows the user to edit a card that can be automatically filled into web page forms. This can be either credit, debit, or prepaid card. [CHAR_LIMIT=32]">
+-        Edit card
+-      </message>
+-     <message name="IDS_AUTOFILL_PROFILE_EDITOR_COUNTRY" desc="Label for a spinner input field containing a list of countries or regions [CHAR_LIMIT=32]">
+-        Country/Region
+-      </message>
+-      <message name="IDS_AUTOFILL_PROFILE_EDITOR_HONORIFIC_PREFIX" desc="Label for text input field containing a title that can be auto-filled by Chrome. A 'Title' field in a web form could be a prefix like Ms., Mx., or Dr. or a position held, like Captain or Rabbi. [CHAR_LIMIT=32]" meaning="Honorific">
+-        Title
+-      </message>
+-      <message name="IDS_AUTOFILL_PROFILE_EDITOR_EMAIL_ADDRESS" desc="Label for text input field containing an e-mail address. [CHAR_LIMIT=32]">
+-        Email
+-      </message>
+-      <message name="IDS_AUTOFILL_PROFILE_EDITOR_PHONE_NUMBER" desc="Label for text input field containing a phone number. [CHAR_LIMIT=32]">
+-        Phone
+-      </message>
+-      <message name="IDS_AUTOFILL_CREDIT_CARD_EDITOR_NAME" desc="Label for text input field containing the name on a credit card. [CHAR_LIMIT=32]">
+-        Name on card
+-      </message>
+-      <message name="IDS_AUTOFILL_CREDIT_CARD_EDITOR_NICKNAME" desc="Label for text input field containing the nickname on a credit card. [CHAR_LIMIT=25]">
+-        Card nickname
+-      </message>
+-      <message name="IDS_AUTOFILL_CREDIT_CARD_EDITOR_INVALID_NICKNAME" desc="Label for text input field containing the nickname on a credit card. [CHAR_LIMIT=25]">
+-        Nickname can’t include numbers
+-      </message>
+-      <message name="IDS_AUTOFILL_CARD_HOLDER_NAME" desc="Label for text input field containing the name on a credit card. [CHAR_LIMIT=32]">
+-        Cardholder name
+-      </message>
+-      <message name="IDS_AUTOFILL_CREDIT_CARD_EDITOR_NUMBER" desc="Label for text input field containing a card number. This can be a credit, debit, or prepaid card. [CHAR_LIMIT=32]">
+-        Card number
+-      </message>
+-      <message name="IDS_AUTOFILL_CREDIT_CARD_EDITOR_EXPIRATION_DATE" desc="Label for text input field containing a credit card expiration date. [CHAR_LIMIT=32]">
+-        Expiration date
+-      </message>
+-      <message name="IDS_AUTOFILL_CREDIT_CARD_EDITOR_EXPIRATION_MONTH" desc="Accessibility label for a spinner input field containing a list of expiration months for a credit card. [CHAR_LIMIT=32]">
+-        Expiration month
+-      </message>
+-      <message name="IDS_AUTOFILL_CREDIT_CARD_EDITOR_EXPIRATION_YEAR" desc="Accessibility label for a spinner input field containing a list of expiration years for a credit card. [CHAR_LIMIT=32]">
+-        Expiration year
+-      </message>
+-      <message name="IDS_AUTOFILL_CREDIT_CARD_EDITOR_BILLING_ADDRESS" desc="Label for a spinner input field containing a list of billing addresses for a credit card. [CHAR_LIMIT=32]">
+-        Billing address
+-      </message>
+-      <message name="IDS_AUTOFILL_DESCRIBE_LOCAL_COPY" desc="Text label that describes a Wallet credit card which has been copied to the local Chrome instance.">
+-         Copied to Chrome
+-      </message>
+-      <message name="IDS_AUTOFILL_PAYMENTS_AUTHENTICATOR_SELECTION_DIALOG_TITLE" desc="Title for the dialog where the user selects an authenticator from a list of options.">
+-        Verify your card
+-      </message>
+-      <message name="IDS_AUTOFILL_PAYMENTS_AUTHENTICATOR_SELECTION_DIALOG_HEADER" desc="Header for the dialog where the user selects an authenticator from a list of options.">
+-        Your bank wants to confirm it\u2019s you.
+-      </message>
+-      <message name="IDS_AUTOFILL_PAYMENTS_AUTHENTICATOR_SELECTION_DIALOG_FOOTER" desc="Footer for the dialog where the user selects an authenticator from a list of options.">
+-        Not seeing your current info? Please contact your bank to update it.
+-      </message>
+-      <message name="IDS_AUTOFILL_PAYMENTS_AUTHENTICATOR_SELECTION_DIALOG_PROGRESS_BAR_MESSAGE" desc="Message shown on the progress bar after the user selects an authenticator from a list of options and proceeds.">
+-        Contacting your bank\u2026
+-      </message>
+-      <message name="IDS_AUTOFILL_PAYMENTS_AUTHENTICATOR_SELECTION_DIALOG_POSITIVE_BUTTON_LABEL" desc="Positive button label for the dialog where the user selects an authenticator from a list of options.">
+-        Continue
+-      </message>
+-      <message name="IDS_AUTOFILL_PAYMENTS_AUTHENTICATOR_SELECTION_DIALOG_NEGATIVE_BUTTON_LABEL" desc="Negative button label for the dialog where the user selects an authenticator from a list of options.">
+-        Cancel
+-      </message>
+ 
+        <!-- Payment Request section preview strings -->
+        <message name="IDS_PAYMENT_REQUEST_PAYMENT_METHODS_PREVIEW" desc="This is a snippet of a payment method a user has saved to Chrome, plus an indication of the number of additional payment methods the user has saved.
+diff --git a/chrome/chrome_paks.gni b/chrome/chrome_paks.gni
+--- a/chrome/chrome_paks.gni
++++ b/chrome/chrome_paks.gni
+@@ -99,7 +99,6 @@ template("chrome_extra_paks") {
+       "$root_gen_dir/chrome/chrome_unscaled_resources.pak",
+       "$root_gen_dir/chrome/common_resources.pak",
+       "$root_gen_dir/chrome/segmentation_internals_resources.pak",
+-      "$root_gen_dir/components/autofill/core/browser/autofill_address_rewriter_resources.pak",
+       "$root_gen_dir/components/components_resources.pak",
+       "$root_gen_dir/content/content_resources.pak",
+       "$root_gen_dir/mojo/public/js/mojo_bindings_resources.pak",
+@@ -117,7 +116,6 @@ template("chrome_extra_paks") {
+       "//chrome/browser:resources",
+       "//chrome/browser/resources/segmentation_internals:resources",
+       "//chrome/common:resources",
+-      "//components/autofill/core/browser:autofill_address_rewriter_resources",
+       "//components/resources",
+       "//content:content_resources",
+       "//mojo/public/js:resources",
+diff --git a/components/BUILD.gn b/components/BUILD.gn
+--- a/components/BUILD.gn
++++ b/components/BUILD.gn
+@@ -70,8 +70,6 @@ test("components_unittests") {
+     "//base",
+     "//components/apdu:unit_tests",
+     "//components/assist_ranker:unit_tests",
+-    "//components/autofill/core/browser:unit_tests",
+-    "//components/autofill/core/common:unit_tests",
+     "//components/base32:unit_tests",
+     "//components/blocklist/opt_out_blocklist:unit_tests",
+     "//components/blocklist/opt_out_blocklist/sql:unit_tests",
+@@ -135,7 +133,6 @@ test("components_unittests") {
+     "//components/openscreen_platform:unittests",
+     "//components/os_crypt:unit_tests",
+     "//components/password_manager/core/browser:unit_tests",
+-    "//components/payments/core:unit_tests",
+     "//components/policy/core/browser:unit_tests",
+     "//components/policy/core/common:unit_tests",
+     "//components/power_scheduler:unit_tests",
+@@ -234,8 +231,6 @@ test("components_unittests") {
+ 
+   if (is_ios) {
+     deps += [
+-      "//components/autofill/ios/browser:unit_tests",
+-      "//components/autofill/ios/form_util:unit_tests",
+       "//components/crash/core/app:unit_tests",
+       "//components/feed/core/v2/public/ios:feed_ios_unit_tests",
+       "//components/image_fetcher/ios:unit_tests",
+@@ -254,9 +249,6 @@ test("components_unittests") {
+   } else {  #!is_ios
+     deps += [
+       "//components/accuracy_tips:unit_tests",
+-      "//components/autofill/content/browser:unit_tests",
+-      "//components/autofill/content/renderer:unit_tests",
+-      "//components/autofill/core/common/mojom:unit_tests",
+       "//components/background_sync:unit_tests",
+       "//components/blocked_content:unit_tests",
+       "//components/browsing_data/content:unit_tests",
+@@ -310,8 +302,6 @@ test("components_unittests") {
+       "//components/paint_preview/player:unit_tests",
+       "//components/paint_preview/renderer:unit_tests",
+       "//components/password_manager/content/browser:unit_tests",
+-      "//components/payments/content:unit_tests",
+-      "//components/payments/content/utility:unit_tests",
+       "//components/performance_manager:unit_tests",
+       "//components/permissions:unit_tests",
+       "//components/permissions/prediction_service:unit_tests",
+@@ -392,9 +382,6 @@ test("components_unittests") {
+   if (is_android) {
+     deps += [
+       "//base:base_java_unittest_support",
+-      "//components/android_autofill/browser:unit_tests",
+-      "//components/autofill_assistant/browser:unit_tests",
+-      "//components/autofill_assistant/content/renderer:unit_tests",
+       "//components/browser_ui/sms/android:unit_tests",
+       "//components/cdm/browser:unit_tests",
+       "//components/component_updater/android:embedded_component_loader_java",
+@@ -416,7 +403,6 @@ test("components_unittests") {
+       "//components/offline_items_collection/core:native_java_unittests_java",
+       "//components/paint_preview/browser/android:java",
+       "//components/paint_preview/player/android:unit_tests",
+-      "//components/payments/content/android",
+       "//components/permissions/android:java",
+       "//components/policy/android:native_test_support_java",
+       "//components/policy/android:policy_java",
+@@ -582,7 +568,6 @@ test("components_unittests") {
+ repack("components_tests_pak") {
+   sources = [
+     "$root_gen_dir/components/arc/input_overlay_resources.pak",
+-    "$root_gen_dir/components/autofill/core/browser/autofill_address_rewriter_resources.pak",
+     "$root_gen_dir/components/components_resources.pak",
+     "$root_gen_dir/components/omnibox/resources/omnibox_pedal_synonyms_en-US.pak",
+     "$root_gen_dir/components/omnibox/resources/omnibox_resources_en-US.pak",
+@@ -595,7 +580,6 @@ repack("components_tests_pak") {
+     # TODO(b/207518736): Input overlay resources will be changed to proto soon,
+     # thus not going to move this resource pak to under ash.
+     "//ash/components/arc/input_overlay/resources:resources_grit",
+-    "//components/autofill/core/browser:autofill_address_rewriter_resources",
+     "//components/omnibox/resources:omnibox_pedal_synonyms",
+     "//components/omnibox/resources:omnibox_resources",
+     "//components/resources",
+@@ -669,12 +653,6 @@ if (!is_ios) {
+     defines = [ "HAS_OUT_OF_PROC_TEST_RUNNER" ]
+ 
+     sources = [
+-      "autofill/content/browser/risk/fingerprint_browsertest.cc",
+-      "autofill/content/renderer/autofill_agent_browsertest.cc",
+-      "autofill/content/renderer/form_autofill_util_browsertest.cc",
+-      "autofill/content/renderer/form_cache_browsertest.cc",
+-      "autofill/content/renderer/html_based_username_detector_browsertest.cc",
+-      "autofill/content/renderer/password_form_conversion_utils_browsertest.cc",
+       "browsing_data/content/browsing_data_helper_browsertest.h",
+       "browsing_data/content/cache_storage_helper_browsertest.cc",
+       "browsing_data/content/database_helper_browsertest.cc",
+@@ -710,10 +688,6 @@ if (!is_ios) {
+     deps = [
+       "//base",
+       "//base/test:test_support",
+-      "//components/autofill/content/browser",
+-      "//components/autofill/content/renderer",
+-      "//components/autofill/content/renderer:test_support",
+-      "//components/autofill/core/browser",
+       "//components/browsing_data/content",
+       "//components/content_capture/browser:browser_tests",
+       "//components/content_settings/core/common",
+@@ -781,19 +755,10 @@ if (!is_ios) {
+ 
+     if (is_android) {
+       sources += [
+-        "autofill_assistant/browser/fake_script_executor_ui_delegate.cc",
+-        "autofill_assistant/browser/fake_script_executor_ui_delegate.h",
+-        "autofill_assistant/browser/js_flow_executor_impl_browsertest.cc",
+-        "autofill_assistant/browser/mock_script_executor_delegate.cc",
+-        "autofill_assistant/browser/mock_script_executor_delegate.h",
+-        "autofill_assistant/browser/web/web_controller_browsertest.cc",
+         "browser_ui/client_certificate/android/ssl_client_certificate_request_browsertest.cc",
+         "test/android/browsertests_apk/components_browser_tests_jni_onload.cc",
+       ]
+       deps += [
+-        "//components/autofill_assistant/browser",
+-        "//components/autofill_assistant/browser:proto",
+-        "//components/autofill_assistant/content/renderer:browser_tests",
+         "//components/browser_ui/client_certificate/android",
+         "//components/browser_ui/client_certificate/android:java",
+         "//components/download/internal/common:internal_java",
+@@ -927,7 +892,6 @@ if (!is_ios) {
+ if (is_android) {
+   junit_binary("components_junit_tests") {
+     deps = [
+-      "//components/android_autofill/browser/junit:components_autofill_junit_tests",
+       "//components/background_task_scheduler:components_background_task_scheduler_junit_tests",
+       "//components/browser_ui/bottomsheet/android/internal:junit_tests",
+       "//components/browser_ui/client_certificate/android:junit",
+@@ -946,7 +910,6 @@ if (is_android) {
+       "//components/media_router/browser/android:junit",
+       "//components/messages/android:junit",
+       "//components/messages/android/internal:junit",
+-      "//components/payments/content/android:junit",
+       "//components/permissions/android:components_permissions_junit_tests",
+       "//components/policy/android:components_policy_junit_tests",
+       "//components/prefs/android:junit",
+diff --git a/components/browser_ui/contacts_picker/android/BUILD.gn b/components/browser_ui/contacts_picker/android/BUILD.gn
+--- a/components/browser_ui/contacts_picker/android/BUILD.gn
++++ b/components/browser_ui/contacts_picker/android/BUILD.gn
+@@ -38,7 +38,6 @@ android_library("java") {
+     "//base:base_java",
+     "//components/browser_ui/util/android:java",
+     "//components/browser_ui/widget/android:java",
+-    "//components/payments/mojom:mojom_java",
+     "//content/public/android:content_java",
+     "//third_party/androidx:androidx_annotation_annotation_java",
+     "//third_party/androidx:androidx_appcompat_appcompat_java",
+@@ -95,7 +94,6 @@ android_library("javatests") {
+     "//chrome/test/android:chrome_java_test_support",
+     "//components/browser_ui/widget/android:java",
+     "//components/browser_ui/widget/android:test_support_java",
+-    "//components/payments/mojom:mojom_java",
+     "//content/public/android:content_java",
+     "//content/public/test/android:content_java_test_support",
+     "//third_party/android_support_test_runner:rules_java",
+diff --git a/components/payments/content/android/BUILD.gn b/components/payments/content/android/BUILD.gn
+--- a/components/payments/content/android/BUILD.gn
++++ b/components/payments/content/android/BUILD.gn
+@@ -194,7 +194,6 @@ android_library("full_java") {
+     ":minimal_java",
+     ":service_java",
+     "//base:base_java",
+-    "//components/autofill/android:autofill_java",
+     "//components/browser_ui/bottomsheet/android:java",
+     "//components/embedder_support/android:util_java",
+     "//components/page_info/android:java",
+@@ -238,7 +237,6 @@ android_library("minimal_java") {
+   deps = [
+     ":service_java",
+     "//base:base_java",
+-    "//components/autofill/android:payments_autofill_java",
+     "//components/payments/mojom:mojom_java",
+     "//content/public/android:content_java",
+     "//mojo/public/java:bindings_java",
+diff --git a/components/payments/core/BUILD.gn b/components/payments/core/BUILD.gn
+--- a/components/payments/core/BUILD.gn
++++ b/components/payments/core/BUILD.gn
+@@ -85,7 +85,6 @@ static_library("core") {
+     ":method_strings",
+     "//base",
+     "//build:chromeos_buildflags",
+-    "//components/autofill/core/browser",
+     "//components/keyed_service/core",
+     "//components/link_header_util",
+     "//components/payments/mojom",
+@@ -144,8 +143,6 @@ static_library("test_support") {
+   deps = [
+     ":core",
+     "//base",
+-    "//components/autofill/core/browser",
+-    "//components/autofill/core/browser:test_support",
+     "//components/leveldb_proto:leveldb_proto",
+     "//components/pref_registry",
+     "//components/prefs",
+@@ -192,8 +189,6 @@ source_set("unit_tests") {
+     ":test_support",
+     "//base",
+     "//base/test:test_support",
+-    "//components/autofill/core/browser",
+-    "//components/autofill/core/browser:test_support",
+     "//components/leveldb_proto:leveldb_proto",
+     "//components/strings:components_strings_grit",
+     "//components/ukm",
+diff --git a/components/unified_consent/BUILD.gn b/components/unified_consent/BUILD.gn
+--- a/components/unified_consent/BUILD.gn
++++ b/components/unified_consent/BUILD.gn
+@@ -15,7 +15,6 @@ static_library("unified_consent") {
+   ]
+   deps = [
+     "//base",
+-    "//components/autofill/core/common",
+     "//components/browser_sync",
+     "//components/pref_registry",
+     "//components/prefs",
+diff --git a/components/webauthn/android/BUILD.gn b/components/webauthn/android/BUILD.gn
+--- a/components/webauthn/android/BUILD.gn
++++ b/components/webauthn/android/BUILD.gn
+@@ -27,7 +27,6 @@ android_library("java") {
+     "//base:base_java",
+     "//base:jni_java",
+     "//components/externalauth/android:java",
+-    "//components/payments/content/android:feature_list_java",
+     "//content/public/android:content_java",
+     "//mojo/public/java:bindings_java",
+     "//mojo/public/java:system_java",
+diff --git a/components/webdata_services/BUILD.gn b/components/webdata_services/BUILD.gn
+--- a/components/webdata_services/BUILD.gn
++++ b/components/webdata_services/BUILD.gn
+@@ -30,7 +30,6 @@ static_library("webdata_services") {
+     ]
+     deps += [
+       "//components/keyed_service/content",
+-      "//components/payments/content:utils",
+       "//content/public/browser",
+     ]
+   }
+diff --git a/content/public/android/BUILD.gn b/content/public/android/BUILD.gn
+--- a/content/public/android/BUILD.gn
++++ b/content/public/android/BUILD.gn
+@@ -139,7 +139,6 @@ android_library("content_full_java") {
+     "//base:base_java",
+     "//build:chromeos_buildflags",
+     "//components/download/public/common:public_java",
+-    "//components/payments/mojom:mojom_java",
+     "//content/public/common:trust_tokens_mojo_bindings_java",
+     "//device/bluetooth:java",
+     "//device/gamepad:java",
+-- 
+2.30.2
+