Change heuristic regex and order to match grabber-continental.

chrome/browser/autofill/autofill_scanner.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/autofill_scanner.h"
 
 #include "base/logging.h"
 #include "chrome/browser/autofill/autofill_field.h"
 
 AutofillScanner::AutofillScanner(const std::vector<AutofillField*>& fields)
@@ skipping 21 matching lines @@
 bool AutofillScanner::IsEnd() const {
   return cursor_ == end_;
 }
 
 void AutofillScanner::Rewind() {
   DCHECK(!saved_cursors_.empty());
   cursor_ = saved_cursors_.back();
   saved_cursors_.pop_back();
 }
 
-void AutofillScanner::SaveCursor() {
+void AutofillScanner::RewindTo(size_t position) {
+  saved_cursors_.resize(position);
+  cursor_ = saved_cursors_.back();
+  saved_cursors_.pop_back();

[Ilya Sherman, 2011/05/13 00:54:53]

(See also the comment below)

Let's instead have this be

cursor_ = start_ + position;

+}
+
+size_t AutofillScanner::SaveCursor() {
   saved_cursors_.push_back(cursor_);
+  size_t index = saved_cursors_.size();

[Ilya Sherman, 2011/05/13 00:54:53]

Let's instead have this be

size_t index = cursor_ - start_;

where |start_| is captured in the constructor as the value of |fields.begin()|

+  return index;
 }