[Payments] Use Autofill assets on Android Payment Request

components/autofill/core/browser/autofill_data_util.cc

Index: components/autofill/core/browser/autofill_data_util.cc
diff --git a/components/autofill/core/browser/autofill_data_util.cc b/components/autofill/core/browser/autofill_data_util.cc
index 215b75829bc326ce644595ab7ed7dd90a4923488..6a97a28a368a8ee790679890e6b89ea5dcf3eb26 100644
--- a/components/autofill/core/browser/autofill_data_util.cc
+++ b/components/autofill/core/browser/autofill_data_util.cc
@@ -25,25 +25,6 @@ namespace {
 // Mappings from Chrome card types to Payment Request API basic card payment
 // spec types and icons. Note that "generic" is not in the spec.
 // https://w3c.github.io/webpayments-methods-card/#method-id
-#if defined(OS_ANDROID)
-// On Android, use the PR-specific resource IDs.
-const PaymentRequestData kPaymentRequestData[]{
-    {"americanExpressCC", "amex", IDR_AUTOFILL_PR_AMEX, IDS_AUTOFILL_CC_AMEX},
-    {"dinersCC", "diners", IDR_AUTOFILL_PR_DINERS, IDS_AUTOFILL_CC_DINERS},
-    {"discoverCC", "discover", IDR_AUTOFILL_PR_DISCOVER,
-     IDS_AUTOFILL_CC_DISCOVER},
-    {"jcbCC", "jcb", IDR_AUTOFILL_PR_JCB, IDS_AUTOFILL_CC_JCB},
-    {"masterCardCC", "mastercard", IDR_AUTOFILL_PR_MASTERCARD,
-     IDS_AUTOFILL_CC_MASTERCARD},
-    {"mirCC", "mir", IDR_AUTOFILL_PR_MIR, IDS_AUTOFILL_CC_MIR},
-    {"unionPayCC", "unionpay", IDR_AUTOFILL_PR_UNIONPAY,
-     IDS_AUTOFILL_CC_UNION_PAY},
-    {"visaCC", "visa", IDR_AUTOFILL_PR_VISA, IDS_AUTOFILL_CC_VISA},
-};
-const PaymentRequestData kGenericPaymentRequestData = {
-    "genericCC", "generic", IDR_AUTOFILL_PR_GENERIC, IDS_AUTOFILL_CC_GENERIC};
-#else  // !defined(OS_ANDROID)
-// On other platforms, use the Autofill resource IDs.
 const PaymentRequestData kPaymentRequestData[]{
     {"americanExpressCC", "amex", IDR_AUTOFILL_CC_AMEX, IDS_AUTOFILL_CC_AMEX},
     {"dinersCC", "diners", IDR_AUTOFILL_CC_DINERS, IDS_AUTOFILL_CC_DINERS},
@@ -59,7 +40,6 @@ const PaymentRequestData kPaymentRequestData[]{
 };
 const PaymentRequestData kGenericPaymentRequestData = {
     "genericCC", "generic", IDR_AUTOFILL_CC_GENERIC, IDS_AUTOFILL_CC_GENERIC};
-#endif
 
 const char* const name_prefixes[] = {
     "1lt",     "1st", "2lt", "2nd",    "3rd",  "admiral", "capt",