Remove some more bad ASCII-centric autofill code.

components/autofill/core/browser/credit_card.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/core/browser/credit_card.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <ostream>
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/guid.h"
 #include "base/logging.h"
 #include "base/strings/string16.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/time/time.h"
 #include "components/autofill/core/browser/autofill_field.h"
 #include "components/autofill/core/browser/autofill_regexes.h"
 #include "components/autofill/core/browser/autofill_type.h"
 #include "components/autofill/core/browser/validation.h"
+#include "components/autofill/core/common/autofill_l10n_util.h"
 #include "components/autofill/core/common/form_field_data.h"
 #include "grit/components_scaled_resources.h"
 #include "grit/components_strings.h"
 #include "third_party/icu/source/common/unicode/uloc.h"
 #include "third_party/icu/source/i18n/unicode/dtfmtsym.h"
 #include "ui/base/l10n/l10n_util.h"
 
 namespace autofill {
 
 namespace {
 
 const base::char16 kCreditCardObfuscationSymbol = '*';
 
 bool ConvertYear(const base::string16& year, int* num) {
   // If the |year| is empty, clear the stored value.
   if (year.empty()) {
     *num = 0;
     return true;
   }
 
   // Try parsing the |year| as a number.
   if (base::StringToInt(year, num))
     return true;
 
   *num = 0;
   return false;
 }
 
-bool ConvertMonth(const base::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;
-
-  // 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".
-  base::string16 lowercased_month = base::StringToLowerASCII(month);
-
-  UErrorCode status = U_ZERO_ERROR;
-  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 base::string16 icu_month = base::string16(months[i].getBuffer(),
-                                        months[i].length());
-    if (lowercased_month == base::StringToLowerASCII(icu_month)) {
-      *num = i + 1;  // Adjust from 0-indexed to 1-indexed.
-      return true;
-    }
-  }
-
-  months = date_format_symbols.getShortMonths(num_months);
-  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 == base::StringToLowerASCII(icu_month)) {
-      *num = i + 1;  // Adjust from 0-indexed to 1-indexed.
-      return true;
-    }
-  }
-
-  *num = 0;
-  return false;
-}
-
 base::string16 TypeForFill(const std::string& type) {
   if (type == kAmericanExpressCard)
     return l10n_util::GetStringUTF16(IDS_AUTOFILL_CC_AMEX);
   if (type == kDinersCard)
     return l10n_util::GetStringUTF16(IDS_AUTOFILL_CC_DINERS);
   if (type == kDiscoverCard)
     return l10n_util::GetStringUTF16(IDS_AUTOFILL_CC_DISCOVER);
   if (type == kJCBCard)
     return l10n_util::GetStringUTF16(IDS_AUTOFILL_CC_JCB);
   if (type == kMasterCard)
@@ skipping 634 matching lines @@
 
 void CreditCard::SetNumber(const base::string16& number) {
   number_ = number;
 
   // Set the type based on the card number, but only for full numbers, not
   // when we have masked cards from the server (last 4 digits).
   if (record_type_ != MASKED_SERVER_CARD)
     type_ = GetCreditCardType(StripSeparators(number_));
 }
 
+// static
+bool CreditCard::ConvertMonth(const base::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;

[Lei Zhang, 2015/04/13 19:59:13]

I wonder if this should return false. It's not a success IMO.

[Evan Stade, 2015/04/13 21:34:13]

good point. It makes more sense if this check is moved to the callsite.

+  }
+
+  // Try parsing the |month| as a number.
+  if (base::StringToInt(month, num))
+    return true;
+
+  // 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".
+  l10n::CaseInsensitiveCompare compare;
+  UErrorCode status = U_ZERO_ERROR;
+  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 base::string16 icu_month(months[i].getBuffer(), months[i].length());
+    if (compare.StringsEqual(icu_month, month)) {
+      *num = i + 1;  // Adjust from 0-indexed to 1-indexed.
+      return true;
+    }
+  }
+
+  months = date_format_symbols.getShortMonths(num_months);
+  // Some abbreviations have . at the end (e.g., "janv." in French). We don't
+  // care about matching that.
+  base::string16 trimmed_month;
+  base::TrimString(month, base::ASCIIToUTF16("."), &trimmed_month);
+  for (int32_t i = 0; i < num_months; ++i) {
+    base::string16 icu_month(months[i].getBuffer(), months[i].length());
+    base::TrimString(icu_month, base::ASCIIToUTF16("."), &icu_month);
+    if (compare.StringsEqual(icu_month, trimmed_month)) {
+      *num = i + 1;  // Adjust from 0-indexed to 1-indexed.
+      return true;
+    }
+  }
+
+  *num = 0;
+  return false;
+}
+
 // So we can compare CreditCards with EXPECT_EQ().
 std::ostream& operator<<(std::ostream& os, const CreditCard& credit_card) {
   return os
       << base::UTF16ToUTF8(credit_card.Label())
       << " "
       << credit_card.guid()
       << " "
       << credit_card.origin()
       << " "
       << base::UTF16ToUTF8(credit_card.GetRawInfo(CREDIT_CARD_NAME))
@@ skipping 14 matching lines @@
 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 kUnionPay = "unionPayCC";
 const char* const kVisaCard = "visaCC";
 
 }  // namespace autofill