[Autofill] Require callers to pass in locale when parsing named months like "January"

chrome/browser/autofill/credit_card.cc

 // Copyright (c) 2012 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/autofill/credit_card.h"
 
 #include <stddef.h>
 
 #include <ostream>
 #include <string>
@@ skipping 149 matching lines @@
   }
 
   // Try parsing the |year| as a number.
   if (base::StringToInt(year, num))
     return true;
 
   *num = 0;
   return false;
 }
 
-bool ConvertMonth(const string16& month, int* num) {
+bool ConvertMonth(const string16& month,
+                  const std::string& app_locale,
+                  int* num) {
   // If the |month| is empty, clear the stored value.
   if (month.empty()) {
     *num = 0;
     return true;
   }
 
   // Try parsing the |month| as a number.
   if (base::StringToInt(month, num))
     return true;
 
-  // Try parsing the |month| as a named month, e.g. "January" or "Jan".
+  // If the locale is unknown, give up.
+  if (app_locale.empty())
+    return false;
+
+  // Otherwise, try parsing the |month| as a named month, e.g. "January" or
+  // "Jan".
   string16 lowercased_month = StringToLowerASCII(month);
 
   UErrorCode status = U_ZERO_ERROR;
-  icu::Locale locale(AutofillCountry::ApplicationLocale().c_str());
+  icu::Locale locale(app_locale.c_str());
   icu::DateFormatSymbols date_format_symbols(locale, status);
   DCHECK(status == U_ZERO_ERROR || status == U_USING_FALLBACK_WARNING ||
          status == U_USING_DEFAULT_WARNING);
 
   int32_t num_months;
   const icu::UnicodeString* months = date_format_symbols.getMonths(num_months);
   for (int32_t i = 0; i < num_months; ++i) {
     const string16 icu_month = string16(months[i].getBuffer(),
                                         months[i].length());
     if (lowercased_month == StringToLowerASCII(icu_month)) {
@@ skipping 88 matching lines @@
   }
 }
 
 void CreditCard::SetRawInfo(AutofillFieldType type, const string16& value) {
   switch (type) {
     case CREDIT_CARD_NAME:
       name_on_card_ = value;
       break;
 
     case CREDIT_CARD_EXP_MONTH:
-      SetExpirationMonthFromString(value);
+      SetExpirationMonthFromString(value, std::string());
       break;
 
     case CREDIT_CARD_EXP_2_DIGIT_YEAR:
       // This is a read-only attribute.
       break;
 
     case CREDIT_CARD_EXP_4_DIGIT_YEAR:
       SetExpirationYearFromString(value);
       break;
 
@@ skipping 32 matching lines @@
     return StripSeparators(number_);
 
   return GetRawInfo(type);
 }
 
 bool CreditCard::SetInfo(AutofillFieldType type,
                          const string16& value,
                          const std::string& app_locale) {
   if (type == CREDIT_CARD_NUMBER)
     SetRawInfo(type, StripSeparators(value));
+  else if (type == CREDIT_CARD_EXP_MONTH)
+    SetExpirationMonthFromString(value, app_locale);
   else
     SetRawInfo(type, value);
 
   return true;
 }
 
 void CreditCard::GetMatchingTypes(const string16& text,
                                   const std::string& app_locale,
                                   FieldTypeSet* matching_types) const {
   FormGroup::GetMatchingTypes(text, app_locale, matching_types);
 
   string16 card_number = GetInfo(CREDIT_CARD_NUMBER, app_locale);
   if (!card_number.empty() && StripSeparators(text) == card_number)
     matching_types->insert(CREDIT_CARD_NUMBER);
 
   int month;
-  if (ConvertMonth(text, &month) && month != 0 && month == expiration_month_)
+  if (ConvertMonth(text, app_locale, &month) && month != 0 &&
+      month == expiration_month_) {
     matching_types->insert(CREDIT_CARD_EXP_MONTH);
+  }
 }
 
 const string16 CreditCard::Label() const {
   string16 label;
   if (number().empty())
     return name_on_card_;  // No CC number, return name only.
 
   string16 obfuscated_cc_number = ObfuscatedNumber();
   if (!expiration_month_ || !expiration_year_)
     return obfuscated_cc_number;  // No expiration date set.
@@ skipping 215 matching lines @@
   return base::IntToString16(Expiration4DigitYear());
 }
 
 string16 CreditCard::Expiration2DigitYearAsString() const {
   if (expiration_year_ == 0)
     return string16();
 
   return base::IntToString16(Expiration2DigitYear());
 }
 
-void CreditCard::SetExpirationMonthFromString(const string16& text) {
+void CreditCard::SetExpirationMonthFromString(const string16& text,
+                                              const std::string& app_locale) {
   int month;
-  if (!ConvertMonth(text, &month))
+  if (!ConvertMonth(text, app_locale, &month))
     return;
 
   SetExpirationMonth(month);
 }
 
 void CreditCard::SetExpirationYearFromString(const string16& text) {
   int year;
   if (!ConvertYear(text, &year))
     return;
 
@@ skipping 43 matching lines @@
 // webkit/glue. We send these strings to WebKit, which then asks
 // WebKitPlatformSupportImpl to load the image data.
 const char* const kAmericanExpressCard = "americanExpressCC";
 const char* const kDinersCard = "dinersCC";
 const char* const kDiscoverCard = "discoverCC";
 const char* const kGenericCard = "genericCC";
 const char* const kJCBCard = "jcbCC";
 const char* const kMasterCard = "masterCardCC";
 const char* const kSoloCard = "soloCC";
 const char* const kVisaCard = "visaCC";