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

components/autofill/core/browser/form_field.h

 // 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.
 
 #ifndef COMPONENTS_AUTOFILL_CORE_BROWSER_FORM_FIELD_H_
 #define COMPONENTS_AUTOFILL_CORE_BROWSER_FORM_FIELD_H_
 
 #include <vector>
 
 #include "base/basictypes.h"
@@ skipping 37 matching lines @@
     MATCH_PASSWORD   = 1 << 7,
     MATCH_NUMBER     = 1 << 8,
     MATCH_ALL_INPUTS =
         MATCH_TEXT | MATCH_EMAIL | MATCH_TELEPHONE | MATCH_SELECT |
         MATCH_TEXT_AREA | MATCH_PASSWORD | MATCH_NUMBER,
 
     // By default match label and name for input/text types.
     MATCH_DEFAULT    = MATCH_LABEL | MATCH_NAME | MATCH_TEXT,
   };
 
+  // When parsing a field's label and name separately with a given pattern:
+  enum ParseNameLabelResult {
+    RESULT_MATCH_NONE,       // No match with the label or name.
+    RESULT_MATCH_LABEL,      // Only the label matches the pattern.
+    RESULT_MATCH_NAME,       // Only the name matches the pattern.
+    RESULT_MATCH_NAME_LABEL  // Name and label both match the pattern.
+  };
+
   // Only derived classes may instantiate.
   FormField() {}
 
   // Attempts to parse a form field with the given pattern.  Returns true on
   // success and fills |match| with a pointer to the field.
   static bool ParseField(AutofillScanner* scanner,
                          const base::string16& pattern,
                          AutofillField** match);
 
   // Parses the stream of fields in |scanner| with regular expression |pattern|
   // as specified in the |match_type| bit field (see |MatchType|).  If |match|
   // is non-NULL and the pattern matches, the matched field is returned.
   // A |true| result is returned in the case of a successful match, false
   // otherwise.
   static bool ParseFieldSpecifics(AutofillScanner* scanner,
                                   const base::string16& pattern,
                                   int match_type,
                                   AutofillField** match);
 
+  // Like ParseFieldSpecifics(), but applies |pattern| against the name and
+  // label of the current field separately. If the return value is
+  // RESULT_MATCH_NAME_LABEL, then |scanner| advances and |match| is filled if
+  // it is non-NULL. Otherwise |scanner| does not advance and |match| does not
+  // change.
+  static ParseNameLabelResult ParseNameAndLabelSeparately(
+      AutofillScanner* scanner,
+      const base::string16& pattern,
+      int match_type,
+      AutofillField** match);
+
   // Attempts to parse a field with an empty label.  Returns true
   // on success and fills |match| with a pointer to the field.
   static bool ParseEmptyLabel(AutofillScanner* scanner, AutofillField** match);
 
   // Adds an association between a field and a type to |map|.
   static bool AddClassification(const AutofillField* field,
                                 ServerFieldType type,
                                 ServerFieldTypeMap* map);
 
   // Returns true iff |type| matches |match_type|.
@@ skipping 35 matching lines @@
   static void ParseFormFieldsPass(ParseFunction parse,
                                   std::vector<AutofillField*>* fields,
                                   ServerFieldTypeMap* map);
 
   DISALLOW_COPY_AND_ASSIGN(FormField);
 };
 
 }  // namespace autofill
 
 #endif  // COMPONENTS_AUTOFILL_CORE_BROWSER_FORM_FIELD_H_