Standardize StringToInt{,64} interface.

chrome/browser/autocomplete_history_manager.cc

 // Copyright (c) 2011 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/autocomplete_history_manager.h"
 
 #include <vector>
 
 #include "base/string16.h"
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/autofill/autofill_external_delegate.h"
 #include "chrome/browser/autofill/credit_card.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/autofill_messages.h"
 #include "chrome/common/pref_names.h"
 #include "content/browser/renderer_host/render_view_host.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "webkit/glue/form_data.h"
 
+using base::StringPiece16;
 using webkit_glue::FormData;
 using webkit_glue::FormField;
 
 namespace {
 
 // Limit on the number of suggestions to appear in the pop-up menu under an
 // text input element in a form.
 const int kMaxAutocompleteMenuItems = 6;
 
 // The separator characters for SSNs.
@@ skipping 24 matching lines @@
   //
   // References for historic practices:
   //   http://www.socialsecurity.gov/history/ssn/geocard.html
   //   http://www.socialsecurity.gov/employer/stateweb.htm
   //   http://www.socialsecurity.gov/employer/ssnvhighgroup.htm
 
   if (number_string.length() != 9 || !IsStringASCII(number_string))
     return false;
 
   int area;
-  if (!base::StringToInt(number_string.begin(),
-                         number_string.begin() + 3,
+  if (!base::StringToInt(StringPiece16(number_string.begin(),
+                                       number_string.begin() + 3),
                          &area))

[erikwright (departed), 2011/12/14 05:29:57]

Sorry, missed this one last time too.

Can you fix up the missing {} on these "if" statements?

I know, they were broken before you got here.

     return false;
   if (area < 1 ||
       area == 666 ||
       area >= 900)
     return false;
 
   int group;
-  if (!base::StringToInt(number_string.begin() + 3,
-                         number_string.begin() + 5,
-                         &group) || group == 0)
+  if (!base::StringToInt(StringPiece16(number_string.begin() + 3,
+                                       number_string.begin() + 5),
+                         &group)
+      || group == 0)
     return false;
 
   int serial;
-  if (!base::StringToInt(number_string.begin() + 5,
-                         number_string.begin() + 9,
-                         &serial) || serial == 0)
+  if (!base::StringToInt(StringPiece16(number_string.begin() + 5,
+                                       number_string.begin() + 9),
+                         &serial)
+      || serial == 0)
     return false;
 
   return true;
 }
 
 bool IsTextField(const FormField& field) {
   return
       field.form_control_type == ASCIIToUTF16("text") ||
       field.form_control_type == ASCIIToUTF16("search") ||
       field.form_control_type == ASCIIToUTF16("tel") ||
@@ skipping 189 matching lines @@
                                              autofill_icons_,
                                              autofill_unique_ids_));
   }
 
   query_id_ = 0;
   autofill_values_.clear();
   autofill_labels_.clear();
   autofill_icons_.clear();
   autofill_unique_ids_.clear();
 }