AutoFill: Remove a static string16.

chrome/browser/autofill/credit_card.cc

 // Copyright (c) 2010 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 "app/l10n_util.h"
 #include "base/basictypes.h"
 #include "base/string_util.h"
+#include "base/string16.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/autofill/autofill_type.h"
 #include "chrome/browser/autofill/field_types.h"
 #include "grit/generated_resources.h"
 
-static const string16 kCreditCardSeparators = ASCIIToUTF16(" -");
-static const char* kCreditCardObfuscationString = "************";
+namespace {
 
-static const AutoFillFieldType kAutoFillCreditCardTypes[] = {
+const string16::value_type kCreditCardSeparators[] = {' ','-',0};
+const char* kCreditCardObfuscationString = "************";
+
+const AutoFillFieldType kAutoFillCreditCardTypes[] = {
   CREDIT_CARD_NAME,
   CREDIT_CARD_NUMBER,
   CREDIT_CARD_TYPE,
   CREDIT_CARD_EXP_MONTH,
   CREDIT_CARD_EXP_4_DIGIT_YEAR,
 };
 
-static const int kAutoFillCreditCardLength =
-    arraysize(kAutoFillCreditCardTypes);
+const int kAutoFillCreditCardLength = arraysize(kAutoFillCreditCardTypes);
+
+}  // namespace
 
 CreditCard::CreditCard(const string16& label, int unique_id)
     : expiration_month_(0),
       expiration_year_(0),
       label_(label),
       unique_id_(unique_id) {
 }
 
 CreditCard::CreditCard(const CreditCard& card) : FormGroup() {
   operator=(card);
@@ skipping 264 matching lines @@
 }
 
 bool CreditCard::operator!=(const CreditCard& creditcard) const {
   return !operator==(creditcard);
 }
 
 // Use the Luhn formula to validate the number.
 // static
 bool CreditCard::IsCreditCardNumber(const string16& text) {
   string16 number;
-  RemoveChars(text, kCreditCardSeparators.c_str(), &number);
+  RemoveChars(text, kCreditCardSeparators, &number);
 
   int sum = 0;
   bool odd = false;
   string16::reverse_iterator iter;
   for (iter = number.rbegin(); iter != number.rend(); ++iter) {
     if (!IsAsciiDigit(*iter))
       return false;
 
     int digit = *iter - '0';
     if (odd) {
@@ skipping 195 matching lines @@
       << UTF16ToUTF8(creditcard.GetFieldText(AutoFillType(CREDIT_CARD_TYPE)))
       << " "
       << UTF16ToUTF8(creditcard.GetFieldText(AutoFillType(CREDIT_CARD_NUMBER)))
       << " "
       << UTF16ToUTF8(creditcard.GetFieldText(
              AutoFillType(CREDIT_CARD_EXP_MONTH)))
       << " "
       << UTF16ToUTF8(creditcard.GetFieldText(
              AutoFillType(CREDIT_CARD_EXP_4_DIGIT_YEAR)));
 }