[rac] Show amex-specific cvc hint for saved autofill card

components/autofill/content/browser/wallet/wallet_items.cc

Index: components/autofill/content/browser/wallet/wallet_items.cc
diff --git a/components/autofill/content/browser/wallet/wallet_items.cc b/components/autofill/content/browser/wallet/wallet_items.cc
index 0517ecbcdb16132aee6e108bd6b392d946073239..cbd3d664ea6d641375a10b1663c582f45ff72649 100644
--- a/components/autofill/content/browser/wallet/wallet_items.cc
+++ b/components/autofill/content/browser/wallet/wallet_items.cc
@@ -80,18 +80,18 @@ WalletItems::MaskedInstrument::Status
   return WalletItems::MaskedInstrument::INAPPLICABLE;
 }
 
-std::string StringIdentifierFromType(WalletItems::MaskedInstrument::Type type) {
+base::string16 DisplayStringFromType(WalletItems::MaskedInstrument::Type type) {
   switch (type) {
-    case WalletItems::MaskedInstrument::VISA:
-      return kVisaCard;
-    case WalletItems::MaskedInstrument::MASTER_CARD:
-      return kMasterCard;
     case WalletItems::MaskedInstrument::AMEX:
-      return kAmericanExpressCard;
+      return CreditCard::TypeForDisplay(kAmericanExpressCard);
     case WalletItems::MaskedInstrument::DISCOVER:
-      return kDiscoverCard;
+      return CreditCard::TypeForDisplay(kDiscoverCard);
+    case WalletItems::MaskedInstrument::MASTER_CARD:
+      return CreditCard::TypeForDisplay(kMasterCard);
+    case WalletItems::MaskedInstrument::VISA:
+      return CreditCard::TypeForDisplay(kVisaCard);
     default:
-      return kGenericCard;
+      return CreditCard::TypeForDisplay(kGenericCard);
   }
 }
 
@@ -276,21 +276,9 @@ base::string16 WalletItems::MaskedInstrument::DisplayNameDetail() const {
 }
 
 base::string16 WalletItems::MaskedInstrument::TypeAndLastFourDigits() const {
-  base::string16 display_type;
-
-  if (type_ == AMEX)
-    display_type = CreditCard::TypeForDisplay(kAmericanExpressCard);
-  else if (type_ == DISCOVER)
-    display_type = CreditCard::TypeForDisplay(kDiscoverCard);
-  else if (type_ == MASTER_CARD)
-    display_type = CreditCard::TypeForDisplay(kMasterCard);
-  else if (type_ == VISA)
-    display_type = CreditCard::TypeForDisplay(kVisaCard);
-  else
-    display_type = CreditCard::TypeForDisplay(kGenericCard);
-
   // TODO(dbeam): i18n.
-  return display_type + ASCIIToUTF16(" - ") + last_four_digits();
+  return DisplayStringFromType(type_) + ASCIIToUTF16(" - ") +
+         last_four_digits();
 }
 
 const gfx::Image& WalletItems::MaskedInstrument::CardIcon() const {
@@ -343,7 +331,7 @@ base::string16 WalletItems::MaskedInstrument::GetInfo(
       break;
 
     case CREDIT_CARD_TYPE:
-      return UTF8ToUTF16(StringIdentifierFromType(type_));
+      return DisplayStringFromType(type_);
 
     default:
       NOTREACHED();