test:

chrome/android/java_sources.gni

Index: chrome/android/java_sources.gni
diff --git a/chrome/android/java_sources.gni b/chrome/android/java_sources.gni
index 3108e662d1aa518e08f0057cffb7e5f6b554924e..75e03baabf71d923269a38346edc3000e835b75d 100644
--- a/chrome/android/java_sources.gni
+++ b/chrome/android/java_sources.gni
@@ -651,13 +651,13 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/password_manager/Credential.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/AutofillPayerInfo.java",
   "java/src/org/chromium/chrome/browser/payments/AutofillPaymentApp.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/ContactEditor.java",
   "java/src/org/chromium/chrome/browser/payments/CurrencyStringFormatter.java",
   "java/src/org/chromium/chrome/browser/payments/EditorBase.java",
+  "java/src/org/chromium/chrome/browser/payments/PayerInfoEditor.java",
   "java/src/org/chromium/chrome/browser/payments/PaymentApp.java",
   "java/src/org/chromium/chrome/browser/payments/PaymentAppFactory.java",
   "java/src/org/chromium/chrome/browser/payments/PaymentInstrument.java",
@@ -1279,22 +1279,22 @@ chrome_test_java_sources = [
   "javatests/src/org/chromium/chrome/browser/policy/CombinedPolicyProviderTest.java",
   "javatests/src/org/chromium/chrome/browser/payments/CurrencyStringFormatterTest.java",
   "javatests/src/org/chromium/chrome/browser/payments/PaymentRequestAbortTest.java",
-  "javatests/src/org/chromium/chrome/browser/payments/PaymentRequestContactDetailsTest.java",
-  "javatests/src/org/chromium/chrome/browser/payments/PaymentRequestContactDetailsAndFreeShippingTest.java",
   "javatests/src/org/chromium/chrome/browser/payments/PaymentRequestDynamicShippingMultipleAddressesTest.java",
   "javatests/src/org/chromium/chrome/browser/payments/PaymentRequestDynamicShippingSingleAddressTest.java",
   "javatests/src/org/chromium/chrome/browser/payments/PaymentRequestEmailTest.java",
   "javatests/src/org/chromium/chrome/browser/payments/PaymentRequestEmailAndFreeShippingTest.java",
   "javatests/src/org/chromium/chrome/browser/payments/PaymentRequestFailCompleteTest.java",
   "javatests/src/org/chromium/chrome/browser/payments/PaymentRequestFreeShippingTest.java",
-  "javatests/src/org/chromium/chrome/browser/payments/PaymentRequestIncompleteContactDetailsTest.java",
   "javatests/src/org/chromium/chrome/browser/payments/PaymentRequestIncompleteEmailTest.java",
+  "javatests/src/org/chromium/chrome/browser/payments/PaymentRequestIncompletePayerInfoDetailsTest.java",
   "javatests/src/org/chromium/chrome/browser/payments/PaymentRequestIncompletePhoneTest.java",
   "javatests/src/org/chromium/chrome/browser/payments/PaymentRequestIncompleteServerCardTest.java",
   "javatests/src/org/chromium/chrome/browser/payments/PaymentRequestMetricsUnitTest.java",
-  "javatests/src/org/chromium/chrome/browser/payments/PaymentRequestMultipleContactDetailsTest.java",
   "javatests/src/org/chromium/chrome/browser/payments/PaymentRequestMetricsTest.java",
+  "javatests/src/org/chromium/chrome/browser/payments/PaymentRequestMultiplePayerInfoDetailsTest.java",
   "javatests/src/org/chromium/chrome/browser/payments/PaymentRequestNoShippingTest.java",
+  "javatests/src/org/chromium/chrome/browser/payments/PaymentRequestPayerInfoDetailsTest.java",
+  "javatests/src/org/chromium/chrome/browser/payments/PaymentRequestPayerInfoDetailsAndFreeShippingTest.java",
   "javatests/src/org/chromium/chrome/browser/payments/PaymentRequestPaymentAppAndCardsTest.java",
   "javatests/src/org/chromium/chrome/browser/payments/PaymentRequestPaymentAppTest.java",
   "javatests/src/org/chromium/chrome/browser/payments/PaymentRequestPhoneTest.java",
@@ -1439,7 +1439,7 @@ chrome_junit_test_java_sources = [
   "junit/src/org/chromium/chrome/browser/offlinepages/downloads/OfflinePageDownloadBridgeTest.java",
   "junit/src/org/chromium/chrome/browser/omaha/ResponseParserTest.java",
   "junit/src/org/chromium/chrome/browser/omaha/VersionNumberTest.java",
-  "junit/src/org/chromium/chrome/browser/payments/AutofillContactTest.java",
+  "junit/src/org/chromium/chrome/browser/payments/AutofillPayerInfoTest.java",
   "junit/src/org/chromium/chrome/browser/payments/CurrencyStringFormatterUnitTest.java",
   "junit/src/org/chromium/chrome/browser/snackbar/SnackbarCollectionUnitTest.java",
   "junit/src/org/chromium/chrome/browser/superviseduser/SupervisedUserContentProviderUnitTest.java",