Simplify Autofill Scanner semantics

chrome/browser/autofill/phone_field.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/autofill/phone_field.h"
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/string16.h"
 #include "base/string_util.h"
@@ skipping 245 matching lines @@
                                AutofillScanner* scanner,
                                bool regular_phone) {
   DCHECK(phone_field);
   scanner->SaveCursor();
 
   // The form owns the following variables, so they should not be deleted.
   const AutofillField* parsed_fields[FIELD_MAX];
 
   for (size_t i = 0; i < arraysize(phone_field_grammars_); ++i) {
     memset(parsed_fields, 0, sizeof(parsed_fields));
-    scanner->Rewind();
     scanner->SaveCursor();
 
     // Attempt to parse according to the next grammar.
     for (; i < arraysize(phone_field_grammars_) &&
          phone_field_grammars_[i].regex != REGEX_SEPARATOR; ++i) {
       if (!ParseFieldSpecifics(
               scanner,
               phone_field->GetRegExp(phone_field_grammars_[i].regex),
               MATCH_DEFAULT | MATCH_TELEPHONE,
               &parsed_fields[phone_field_grammars_[i].phone_part]))
@@ skipping 16 matching lines @@
     // Proceed to the next grammar.
     do {
       ++i;
     } while (i < arraysize(phone_field_grammars_) &&
              phone_field_grammars_[i].regex != REGEX_SEPARATOR);
 
     if (i + 1 == arraysize(phone_field_grammars_)) {
       scanner->Rewind();
       return false;  // Tried through all the possibilities - did not match.
     }
+
+    scanner->Rewind();
   }
 
   if (!parsed_fields[FIELD_PHONE]) {
     scanner->Rewind();
     return false;
   }
 
   for (int i = 0; i < FIELD_MAX; ++i)
     phone_field->parsed_phone_fields_[i] = parsed_fields[i];
 
@@ skipping 18 matching lines @@
 void PhoneField::SetPhoneType(PhoneType phone_type) {
   // Field types are different as well, so we create a temporary phone number,
   // to get relevant field types.
   if (phone_type == HOME_PHONE)
     number_.reset(new PhoneNumber(AutofillType::PHONE_HOME));
   else
     number_.reset(new PhoneNumber(AutofillType::PHONE_FAX));
   phone_type_ = phone_type;
 }