Change heuristic regex and order to match grabber-continental.

chrome/browser/autofill/autofill_scanner.h

 // 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.
 
 #ifndef CHROME_BROWSER_AUTOFILL_AUTOFILL_SCANNER_H_
 #define CHROME_BROWSER_AUTOFILL_AUTOFILL_SCANNER_H_
 #pragma once
 
 #include <vector>
 
@@ skipping 13 matching lines @@
   // Returns the current field in the stream, or |NULL| if there are no more
   // fields in the stream.
   const AutofillField* Cursor() const;
 
   // Returns |true| if the cursor has reached the end of the stream.
   bool IsEnd() const;
 
   // Returns the most recently saved cursor -- see also |SaveCursor()|.
   void Rewind();
 
+  // Returns the specified |index| saved cursor. |index| must be the return
+  // value of |SaveCursor()|.
+  void RewindTo(size_t position);
+
   // Saves the current cursor position.  Multiple cursor positions can be saved,
-  // with stack ordering semantics.  See also |Rewind()|.
-  void SaveCursor();
+  // with stack ordering semantics. Returns the saved cursor position.
+  // See also |Rewind()|.
+  size_t SaveCursor();
 
  private:
   // Indicates the current position in the stream, represented as a vector.
   std::vector<AutofillField*>::const_iterator cursor_;
 
   // A stack of saved positions in the stream.
   std::vector<std::vector<AutofillField*>::const_iterator> saved_cursors_;

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

Since we need to expose RewindTo() functionality anyway, let's not also provide
stack semantics as we have here.  So, let's change this to be 

// The most recently saved position in the stream.
std::vector<AutofillField*>::const_iterator saved_cursor_;

 
   // The past-the-end pointer for the stream.
   const std::vector<AutofillField*>::const_iterator end_;
 
   DISALLOW_COPY_AND_ASSIGN(AutofillScanner);
 };
 
 #endif  // CHROME_BROWSER_AUTOFILL_AUTOFILL_SCANNER_H_