Autofill: Improve heuristics for city/state/zip fields.

components/autofill/core/browser/form_field.cc

 // Copyright 2013 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 "components/autofill/core/browser/form_field.h"
 
 #include <stddef.h>
 #include <string>
 #include <utility>
 
@@ skipping 88 matching lines @@
 
   const AutofillField* field = scanner->Cursor();
 
   if (!MatchesFormControlType(field->form_control_type, match_type))
     return false;
 
   return MatchAndAdvance(scanner, pattern, match_type, match);
 }
 
 // static
+FormField::ParseNameLabelResult FormField::ParseNameAndLabelSeparately(
+    AutofillScanner* scanner,
+    const base::string16& pattern,
+    int match_type,
+    AutofillField** match) {
+  if (scanner->IsEnd())
+    return RESULT_MATCH_NONE;
+
+  AutofillField* cur_match = nullptr;
+  size_t saved_cursor = scanner->SaveCursor();
+  bool parsed_name = ParseFieldSpecifics(scanner,
+                                         pattern,
+                                         match_type & ~MATCH_LABEL,
+                                         &cur_match);
+  scanner->RewindTo(saved_cursor);
+  bool parsed_label = ParseFieldSpecifics(scanner,
+                                          pattern,
+                                          match_type & ~MATCH_NAME,
+                                          &cur_match);
+  if (parsed_name && parsed_label) {
+    if (match)
+      *match = cur_match;
+    return RESULT_MATCH_NAME_LABEL;
+  }
+
+  scanner->RewindTo(saved_cursor);
+  if (parsed_name)
+    return RESULT_MATCH_NAME;
+  if (parsed_label)
+    return RESULT_MATCH_LABEL;
+  return RESULT_MATCH_NONE;
+}
+
+// static
 bool FormField::ParseEmptyLabel(AutofillScanner* scanner,
                                 AutofillField** match) {
   return ParseFieldSpecifics(scanner,
                              base::ASCIIToUTF16("^$"),
                              MATCH_LABEL | MATCH_ALL_INPUTS,
                              match);
 }
 
 // static
 bool FormField::AddClassification(const AutofillField* field,
@@ skipping 83 matching lines @@
   if ((match_type & MATCH_PASSWORD) && type == "password")
     return true;
 
   if ((match_type & MATCH_NUMBER) && type == "number")
     return true;
 
   return false;
 }
 
 }  // namespace autofill