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

chrome/browser/autofill/form_structure.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/form_structure.h"
 
 #include "base/basictypes.h"
 #include "base/logging.h"
 #include "base/sha1.h"
-#include "base/string_util.h"
+#include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/autofill/autofill_xml_parser.h"
 #include "chrome/browser/autofill/field_types.h"
 #include "chrome/browser/autofill/form_field.h"
 #include "third_party/libjingle/source/talk/xmllite/xmlelement.h"
 #include "webkit/glue/form_field.h"
 
 using webkit_glue::FormData;
 
 namespace {
@@ skipping 54 matching lines @@
     // to match the form signature of the AutoFill servers.
     if (LowerCaseEqualsASCII(field->form_control_type(), kControlTypeText) ||
         LowerCaseEqualsASCII(field->form_control_type(), kControlTypeSelect)) {
       // Add all supported form fields (including with empty names) to
       // signature.  This is a requirement for AutoFill servers.
       form_signature_field_names_.append("&");
       form_signature_field_names_.append(UTF16ToUTF8(field->name()));
     }
 
     // Generate a unique name for this field by appending a counter to the name.
-    string16 unique_name = field->name() + IntToString16(fields_.size() + 1);
+    string16 unique_name = field->name() +
+        base::IntToString16(fields_.size() + 1);
     fields_.push_back(new AutoFillField(*field, unique_name));
   }
 
   // Terminate the vector with a NULL item.
   fields_.push_back(NULL);
   GetHeuristicAutoFillTypes();
 
   std::string method = UTF16ToUTF8(form.method);
   if (StringToLowerASCII(method) == kFormMethodPost) {
     method_ = POST;
@@ skipping 338 matching lines @@
     } else {
       buzz::XmlElement *field_element = new buzz::XmlElement(
           buzz::QName(kXMLElementField));
       field_element->SetAttr(buzz::QName(kAttributeSignature),
                              field->FieldSignature());
       encompassing_xml_element->AddElement(field_element);
     }
   }
   return true;
 }