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

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

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/autofill/content/browser/wallet/wallet_items.h"
 
 #include "base/logging.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
@@ skipping 62 matching lines @@
     return WalletItems::MaskedInstrument::DISABLED_FOR_THIS_MERCHANT;
   if (status_string == "UNSUPPORTED_COUNTRY")
     return WalletItems::MaskedInstrument::UNSUPPORTED_COUNTRY;
   if (status_string == "EXPIRED")
     return WalletItems::MaskedInstrument::EXPIRED;
   if (status_string == "BILLING_INCOMPLETE")
     return WalletItems::MaskedInstrument::BILLING_INCOMPLETE;
   return WalletItems::MaskedInstrument::INAPPLICABLE;
 }
 
-std::string StringIdentifierFromType(WalletItems::MaskedInstrument::Type type) {
+base::string16 DisplayStringFromType(WalletItems::MaskedInstrument::Type type) {
   switch (type) {
+    case WalletItems::MaskedInstrument::AMEX:
+      return CreditCard::TypeForDisplay(kAmericanExpressCard);
+    case WalletItems::MaskedInstrument::DISCOVER:
+      return CreditCard::TypeForDisplay(kDiscoverCard);
+    case WalletItems::MaskedInstrument::MASTER_CARD:
+      return CreditCard::TypeForDisplay(kMasterCard);
     case WalletItems::MaskedInstrument::VISA:
-      return kVisaCard;
-    case WalletItems::MaskedInstrument::MASTER_CARD:
-      return kMasterCard;
-    case WalletItems::MaskedInstrument::AMEX:
-      return kAmericanExpressCard;
-    case WalletItems::MaskedInstrument::DISCOVER:
-      return kDiscoverCard;
+      return CreditCard::TypeForDisplay(kVisaCard);
     default:
-      return kGenericCard;
+      return CreditCard::TypeForDisplay(kGenericCard);
   }
 }
 
 }  // anonymous namespace
 
 WalletItems::MaskedInstrument::MaskedInstrument(
     const base::string16& descriptive_name,
     const WalletItems::MaskedInstrument::Type& type,
     const std::vector<base::string16>& supported_currencies,
     const base::string16& last_four_digits,
@@ skipping 164 matching lines @@
 base::string16 WalletItems::MaskedInstrument::DisplayNameDetail() const {
 #if defined(OS_ANDROID)
   // TODO(aruslan): improve this stub implementation.
   return address().DisplayName();
 #else
   return base::string16();
 #endif
 }
 
 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 {
   int idr = 0;
   switch (type_) {
     case AMEX:
       idr = IDR_AUTOFILL_CC_AMEX;
       break;
 
     case DISCOVER:
@@ skipping 32 matching lines @@
     case CREDIT_CARD_NUMBER:
       return DisplayName();
 
     case CREDIT_CARD_EXP_4_DIGIT_YEAR:
       return base::IntToString16(expiration_year());
 
     case CREDIT_CARD_VERIFICATION_CODE:
       break;
 
     case CREDIT_CARD_TYPE:
-      return UTF8ToUTF16(StringIdentifierFromType(type_));
+      return DisplayStringFromType(type_);
 
     default:
       NOTREACHED();
   }
 
   return base::string16();
 }
 
 WalletItems::LegalDocument::~LegalDocument() {}
 
@@ skipping 177 matching lines @@
          VectorsAreEqual<LegalDocument>(legal_documents(),
                                         other.legal_documents());
 }
 
 bool WalletItems::operator!=(const WalletItems& other) const {
   return !(*this == other);
 }
 
 }  // namespace wallet
 }  // namespace autofill