Move the number conversions from string_util to a new file....

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 <string>
 
 #include "app/l10n_util.h"
 #include "base/basictypes.h"
 #include "base/string_util.h"
+#include "base/string_number_conversions.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"
 
 namespace {
 
 const string16::value_type kCreditCardSeparators[] = {' ','-',0};
 const char* kCreditCardObfuscationString = "************";
@@ skipping 409 matching lines @@
   FieldTypeSet types;
   GetAvailableFieldTypes(&types);
   return types.empty() && billing_address().empty();
 }
 
 
 string16 CreditCard::ExpirationMonthAsString() const {
   if (expiration_month_ == 0)
     return string16();
 
-  string16 month = IntToString16(expiration_month_);
+  string16 month = base::IntToString16(expiration_month_);
   if (expiration_month_ >= 10)
     return month;
 
   string16 zero = ASCIIToUTF16("0");
   zero.append(month);
   return zero;
 }
 
 string16 CreditCard::Expiration4DigitYearAsString() const {
   if (expiration_year_ == 0)
     return string16();
 
-  return IntToString16(Expiration4DigitYear());
+  return base::IntToString16(Expiration4DigitYear());
 }
 
 string16 CreditCard::Expiration2DigitYearAsString() const {
   if (expiration_year_ == 0)
     return string16();
 
-  return IntToString16(Expiration2DigitYear());
+  return base::IntToString16(Expiration2DigitYear());
 }
 
 void CreditCard::SetExpirationMonthFromString(const string16& text) {
   int month;
   if (!ConvertDate(text, &month))
     return;
 
   set_expiration_month(month);
 }
 
@@ skipping 84 matching lines @@
   }
   return !match->empty();
 }
 
 bool CreditCard::IsNameOnCard(const string16& text) const {
   return StringToLowerASCII(text) == StringToLowerASCII(name_on_card_);
 }
 
 bool CreditCard::IsExpirationMonth(const string16& text) const {
   int month;
-  if (!StringToInt(text, &month))
+  if (!base::StringToInt(text, &month))
     return false;
 
   return expiration_month_ == month;
 }
 
 bool CreditCard::Is2DigitExpirationYear(const string16& text) const {
   int year;
-  if (!StringToInt(text, &year))
+  if (!base::StringToInt(text, &year))
     return false;
 
   return year < 100 && (expiration_year_ % 100) == year;
 }
 
 bool CreditCard::Is4DigitExpirationYear(const string16& text) const {
   int year;
-  if (!StringToInt(text, &year))
+  if (!base::StringToInt(text, &year))
     return false;
 
   return expiration_year_ == year;
 }
 
 bool CreditCard::ConvertDate(const string16& date, int* num) const {
   if (!date.empty()) {
-    bool converted = StringToInt(date, num);
+    bool converted = base::StringToInt(date, num);
     DCHECK(converted);
     if (!converted)
       return false;
   } else {
     // Clear the value.
     *num = 0;
   }
 
   return true;
 }
@@ skipping 12 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)));
 }