Index: components/autofill/content/browser/wallet/full_wallet.cc |
diff --git a/components/autofill/content/browser/wallet/full_wallet.cc b/components/autofill/content/browser/wallet/full_wallet.cc |
index 4a13b4f3b01439cfb1371d4a8b743d65698e8fd1..d4b390ada82c01641106c6e3f6ea5ca3e7e85a5f 100644 |
--- a/components/autofill/content/browser/wallet/full_wallet.cc |
+++ b/components/autofill/content/browser/wallet/full_wallet.cc |
@@ -157,13 +157,13 @@ scoped_ptr<FullWallet> |
base::string16 FullWallet::GetInfo(const AutofillType& type) { |
switch (type.GetStorableType()) { |
case CREDIT_CARD_NUMBER: |
- return UTF8ToUTF16(GetPan()); |
+ return base::UTF8ToUTF16(GetPan()); |
case CREDIT_CARD_NAME: |
return billing_address()->recipient_name(); |
case CREDIT_CARD_VERIFICATION_CODE: |
- return UTF8ToUTF16(GetCvn()); |
+ return base::UTF8ToUTF16(GetCvn()); |
case CREDIT_CARD_EXP_MONTH: |
if (expiration_month() == 0) |
@@ -183,18 +183,18 @@ base::string16 FullWallet::GetInfo(const AutofillType& type) { |
case CREDIT_CARD_EXP_DATE_2_DIGIT_YEAR: |
if (expiration_month() == 0 || expiration_year() == 0) |
return base::string16(); |
- return base::IntToString16(expiration_month()) + ASCIIToUTF16("/") + |
+ return base::IntToString16(expiration_month()) + base::ASCIIToUTF16("/") + |
base::IntToString16(expiration_year() % 100); |
case CREDIT_CARD_EXP_DATE_4_DIGIT_YEAR: |
if (expiration_month() == 0 || expiration_year() == 0) |
return base::string16(); |
- return base::IntToString16(expiration_month()) + ASCIIToUTF16("/") + |
+ return base::IntToString16(expiration_month()) + base::ASCIIToUTF16("/") + |
base::IntToString16(expiration_year()); |
case CREDIT_CARD_TYPE: { |
std::string internal_type = |
- CreditCard::GetCreditCardType(UTF8ToUTF16(GetPan())); |
+ CreditCard::GetCreditCardType(base::UTF8ToUTF16(GetPan())); |
if (internal_type == kGenericCard) |
return base::string16(); |
return CreditCard::TypeForDisplay(internal_type); |