Update code that previously constructed strings from string iterators only to...

chrome/browser/autocomplete_history_manager.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/autocomplete_history_manager.h"
 
 #include <vector>
 
 #include "base/string16.h"
 #include "base/string_number_conversions.h"
@@ skipping 13 matching lines @@
 // 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.
 const string16 kSSNSeparators = ASCIIToUTF16(" -");
 
 bool IsSSN(const string16& text) {
   string16 number_string;
   RemoveChars(text, kSSNSeparators.c_str(), &number_string);
-  if (number_string.length() != 9 || !IsStringASCII(number_string))
-    return false;
 
   // A SSN is of the form AAA-GG-SSSS (A = area number, G = group number, S =
   // serial number). The validation we do here is simply checking if the area,
   // group, and serial numbers are valid. It is possible to check if the group
   // number is valid for the given area, but that data changes all the time.
   //
   // See: http://www.socialsecurity.gov/history/ssn/geocard.html
   //      http://www.socialsecurity.gov/employer/stateweb.htm
   //      http://www.socialsecurity.gov/employer/ssnvhighgroup.htm
-
-  string16 area_string = number_string.substr(0, 3);
-  string16 group_string = number_string.substr(3, 2);
-  string16 serial_string = number_string.substr(5, 4);
+  if (number_string.length() != 9 || !IsStringASCII(number_string))
+    return false;
 
   int area;
-  if (!base::StringToInt(area_string, &area))
+  if (!base::StringToInt(number_string.begin(),
+                         number_string.begin() + 3,
+                         &area))
     return false;
   if (area < 1 ||
       area == 666 ||
       (area > 733 && area < 750) ||
       area > 772)
     return false;
 
   int group;
-  if (!base::StringToInt(group_string, &group) || group == 0)
+  if (!base::StringToInt(number_string.begin() + 3,
+                         number_string.begin() + 5,
+                         &group) || group == 0)
     return false;
 
   int serial;
-  if (!base::StringToInt(serial_string, &serial) || serial == 0)
+  if (!base::StringToInt(number_string.begin() + 5,
+                         number_string.begin() + 9,
+                         &serial) || serial == 0)
     return false;
 
   return true;
 }
 
 }  // namespace
 
 AutocompleteHistoryManager::AutocompleteHistoryManager(
     TabContents* tab_contents) : tab_contents_(tab_contents),
                                  pending_query_handle_(0),
@@ skipping 110 matching lines @@
     DCHECK(result->GetType() == AUTOFILL_VALUE_RESULT);
     const WDResult<std::vector<string16> >* autofill_result =
         static_cast<const WDResult<std::vector<string16> >*>(result);
     host->AutocompleteSuggestionsReturned(
         query_id_, autofill_result->GetValue());
   } else {
     host->AutocompleteSuggestionsReturned(
         query_id_, std::vector<string16>());
   }
 }