Change heuristic regex and order to match grabber-continental.

chrome/browser/autofill/form_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/form_field.h"
 
 #include <stddef.h>
 #include <string>
 #include <utility>
 
@@ skipping 217 matching lines @@
   field = CreditCardField::Parse(scanner, is_ecml);
   if (field)
     return field;
 
   // We search for a |NameField| last since it matches the word "name", which is
   // relatively general.
   return NameField::Parse(scanner, is_ecml);
 }
 
 // static
-bool FormField::ParseText(AutofillScanner* scanner, const string16& pattern) {
+bool FormField::ParseText(AutofillScanner* scanner, const Pattern& pattern) {
   const AutofillField* field;
   return ParseText(scanner, pattern, &field);
 }
 
 // static
 bool FormField::ParseText(AutofillScanner* scanner,
-                          const string16& pattern,
+                          const Pattern& pattern,
                           const AutofillField** dest) {
   return ParseText(scanner, pattern, dest, false);
 }
 
 // static
 bool FormField::ParseEmptyText(AutofillScanner* scanner,
                                const AutofillField** dest) {
-  return ParseLabelText(scanner, ASCIIToUTF16("^$"), dest);
+  return ParseLabelText(scanner, Pattern(ASCIIToUTF16("^$")), dest);
 }
 
 // static
 bool FormField::ParseLabelText(AutofillScanner* scanner,
-                               const string16& pattern,
+                               const Pattern& pattern,
                                const AutofillField** dest) {
   return ParseText(scanner, pattern, dest, true);
 }
 
 // static
 bool FormField::ParseText(AutofillScanner* scanner,
-                          const string16& pattern,
+                          const Pattern& pattern,
                           const AutofillField** dest,
                           bool match_label_only) {
   if (scanner->IsEnd())
     return false;
 
   const AutofillField* field = scanner->Cursor();
-  if (Match(field, pattern, match_label_only)) {
+
+  if (!pattern.select_one_is_ok &&
+       field->form_control_type == ASCIIToUTF16("select-one"))
+    return false;
+
+  if (Match(field, pattern.pattern, match_label_only)) {
     if (dest)
       *dest = field;
     scanner->Advance();
     return true;
   }
 
   return false;
 }
 
 // static
@@ skipping 32 matching lines @@
 string16 FormField::GetEcmlPattern(const char* ecml_name) {
   return ASCIIToUTF16(std::string("^") + ecml_name);
 }
 
 string16 FormField::GetEcmlPattern(const char* ecml_name1,
                                    const char* ecml_name2,
                                    char pattern_operator) {
   return ASCIIToUTF16(StringPrintf("^%s%c^%s",
                                    ecml_name1, pattern_operator, ecml_name2));
 }