Revert 114929 - Standardize StringToInt{,64} interface.

chrome/browser/autocomplete_history_manager.cc

Index: chrome/browser/autocomplete_history_manager.cc
===================================================================
--- chrome/browser/autocomplete_history_manager.cc	(revision 114929)
+++ chrome/browser/autocomplete_history_manager.cc	(working copy)
@@ -19,7 +19,6 @@
 #include "content/browser/tab_contents/tab_contents.h"
 #include "webkit/forms/form_data.h"
 
-using base::StringPiece16;
 using webkit::forms::FormData;
 using webkit::forms::FormField;
 
@@ -64,32 +63,26 @@
     return false;
 
   int area;
-  if (!base::StringToInt(StringPiece16(number_string.begin(),
-                                       number_string.begin() + 3),
-                         &area)) {
+  if (!base::StringToInt(number_string.begin(),
+                         number_string.begin() + 3,
+                         &area))
     return false;
-  }
   if (area < 1 ||
       area == 666 ||
-      area >= 900) {
+      area >= 900)
     return false;
-  }
 
   int group;
-  if (!base::StringToInt(StringPiece16(number_string.begin() + 3,
-                                       number_string.begin() + 5),
-                         &group)
-      || group == 0) {
+  if (!base::StringToInt(number_string.begin() + 3,
+                         number_string.begin() + 5,
+                         &group) || group == 0)
     return false;
-  }
 
   int serial;
-  if (!base::StringToInt(StringPiece16(number_string.begin() + 5,
-                                       number_string.begin() + 9),
-                         &serial)
-      || serial == 0) {
+  if (!base::StringToInt(number_string.begin() + 5,
+                         number_string.begin() + 9,
+                         &serial) || serial == 0)
     return false;
-  }
 
   return true;
 }