Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / components / autofill / core / browser / credit_card.cc

diff --git a/src/components/autofill/core/browser/credit_card.cc b/src/components/autofill/core/browser/credit_card.cc
index bc9cebf..ee4aa1e 100644 (file)
--- a/src/components/autofill/core/browser/credit_card.cc
+++ b/src/components/autofill/core/browser/credit_card.cc
@@ -75,7 +75,7 @@ bool ConvertMonth(const base::string16& month,
 
   // Otherwise, try parsing the |month| as a named month, e.g. "January" or
   // "Jan".
-  base::string16 lowercased_month = StringToLowerASCII(month);
+  base::string16 lowercased_month = base::StringToLowerASCII(month);
 
   UErrorCode status = U_ZERO_ERROR;
   icu::Locale locale(app_locale.c_str());
@@ -88,7 +88,7 @@ bool ConvertMonth(const base::string16& month,
   for (int32_t i = 0; i < num_months; ++i) {
     const base::string16 icu_month = base::string16(months[i].getBuffer(),
                                         months[i].length());
-    if (lowercased_month == StringToLowerASCII(icu_month)) {
+    if (lowercased_month == base::StringToLowerASCII(icu_month)) {
       *num = i + 1;  // Adjust from 0-indexed to 1-indexed.
       return true;
     }
@@ -98,7 +98,7 @@ bool ConvertMonth(const base::string16& month,
   for (int32_t i = 0; i < num_months; ++i) {
     const base::string16 icu_month = base::string16(months[i].getBuffer(),
                                         months[i].length());
-    if (lowercased_month == StringToLowerASCII(icu_month)) {
+    if (lowercased_month == base::StringToLowerASCII(icu_month)) {
       *num = i + 1;  // Adjust from 0-indexed to 1-indexed.
       return true;
     }
@@ -185,7 +185,7 @@ int CreditCard::IconResourceId(const std::string& type) {
 }
 
 // static
-std::string CreditCard::GetCreditCardType(const base::string16& number) {
+const char* CreditCard::GetCreditCardType(const base::string16& number) {
   // Credit card number specifications taken from:
   // http://en.wikipedia.org/wiki/Credit_card_numbers,
   // http://en.wikipedia.org/wiki/List_of_Issuer_Identification_Numbers,