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

chrome/browser/ui/autofill/autofill_dialog_controller_impl.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 "chrome/browser/ui/autofill/autofill_dialog_controller_impl.h"
 
 #include <algorithm>
 #include <map>
 #include <string>
 
@@ skipping 528 matching lines @@
   if (input_card_idr == IDR_AUTOFILL_CC_GENERIC) {
     // When the credit card type is unknown, no image should be shown. However,
     // to simplify the view code on Mac, save space for the credit card image by
     // returning a transparent image of the appropriate size.
     result = gfx::Image(gfx::ImageSkiaOperations::CreateTransparentImage(
         result.AsImageSkia(), 0));
   }
   return result;
 }
 
-gfx::Image CvcIconForCreditCardType(const std::string& credit_card_type) {
+gfx::Image CvcIconForCreditCardType(const base::string16& credit_card_type) {
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
-  if (credit_card_type == autofill::kAmericanExpressCard)
+  if (credit_card_type == l10n_util::GetStringUTF16(IDS_AUTOFILL_CC_AMEX))
     return rb.GetImageNamed(IDR_CREDIT_CARD_CVC_HINT_AMEX);
 
   return rb.GetImageNamed(IDR_CREDIT_CARD_CVC_HINT);
 }
 
 }  // namespace
 
 AutofillDialogViewDelegate::~AutofillDialogViewDelegate() {}
 
 AutofillDialogControllerImpl::~AutofillDialogControllerImpl() {
@@ skipping 970 matching lines @@
 gfx::Image AutofillDialogControllerImpl::ExtraSuggestionIconForSection(
     DialogSection section) {
   if (section != SECTION_CC && section != SECTION_CC_BILLING)
     return gfx::Image();
 
   scoped_ptr<DataModelWrapper> model = CreateWrapper(section);
   if (!model.get())
     return gfx::Image();
 
   return CvcIconForCreditCardType(
-      UTF16ToUTF8(model->GetInfo(AutofillType(CREDIT_CARD_TYPE))));
+      model->GetInfo(AutofillType(CREDIT_CARD_TYPE)));
 }
 
 // TODO(groby): Remove this deprecated method after Mac starts using
 // IconsForFields. http://crbug.com/292876
 gfx::Image AutofillDialogControllerImpl::IconForField(
     ServerFieldType type, const string16& user_input) const {
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   if (type == CREDIT_CARD_VERIFICATION_CODE)
     return rb.GetImageNamed(IDR_CREDIT_CARD_CVC_HINT);
 
@@ skipping 10 matching lines @@
     return
         gfx::Image(gfx::ImageSkiaOperations::CreateTransparentImage(image, 0));
   }
 
   return gfx::Image();
 }
 
 FieldIconMap AutofillDialogControllerImpl::IconsForFields(
     const FieldValueMap& user_inputs) const {
   FieldIconMap result;
-  std::string credit_card_type = autofill::kGenericCard;
+  base::string16 credit_card_type;
 
   FieldValueMap::const_iterator credit_card_iter =
       user_inputs.find(CREDIT_CARD_NUMBER);
   if (credit_card_iter != user_inputs.end()) {
-    const string16& credit_card_number = credit_card_iter->second;
-    credit_card_type = CreditCard::GetCreditCardType(credit_card_number);
-    result[CREDIT_CARD_NUMBER] = CreditCardIconForType(credit_card_type);
+    const string16& number = credit_card_iter->second;
+    const std::string type = CreditCard::GetCreditCardType(number);
+    credit_card_type = CreditCard::TypeForDisplay(type);
+    result[CREDIT_CARD_NUMBER] = CreditCardIconForType(type);
   }
 
   if (!user_inputs.count(CREDIT_CARD_VERIFICATION_CODE))
     return result;
 
   result[CREDIT_CARD_VERIFICATION_CODE] =
       CvcIconForCreditCardType(credit_card_type);
 
   return result;
 }
@@ skipping 1825 matching lines @@
 }
 
 void AutofillDialogControllerImpl::OnSubmitButtonDelayEnd() {
   if (!view_)
     return;
   ScopedViewUpdates updates(view_.get());
   view_->UpdateButtonStrip();
 }
 
 }  // namespace autofill