[Autofill] Distinguish between native field types and potentially HTML field types.

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"
 #include "base/gtest_prod_util.h"
 #include "base/strings/string16.h"
-#include "components/autofill/core/browser/autofill_type.h"
+#include "components/autofill/core/browser/field_types.h"
 
 namespace autofill {
 
 class AutofillField;
 class AutofillScanner;
 
 // Represents a logical form field in a web form.  Classes that implement this
 // interface can identify themselves as a particular type of form field, e.g.
 // name, phone number, or address field.
 class FormField {
  public:
   virtual ~FormField() {}
 
   // Classifies each field in |fields| with its heuristically detected type.
   // The association is stored into |map|.  Each field has a derived unique name
   // that is used as the key into the |map|.
   static void ParseFormFields(const std::vector<AutofillField*>& fields,
-                              FieldTypeMap* map);
+                              ServerFieldTypeMap* map);
 
  protected:
   // A bit-field used for matching specific parts of a field in question.
   enum MatchType {
     // Attributes.
     MATCH_LABEL      = 1 << 0,
     MATCH_NAME       = 1 << 1,
     MATCH_VALUE      = 1 << 2,
 
     // Input types.
@@ skipping 27 matching lines @@
                                   int match_type,
                                   const 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,
                               const AutofillField** match);
 
   // Adds an association between a field and a type to |map|.
   static bool AddClassification(const AutofillField* field,
-                                AutofillFieldType type,
-                                FieldTypeMap* map);
+                                ServerFieldType type,
+                                ServerFieldTypeMap* map);
 
   // Derived classes must implement this interface to supply field type
   // information.  |ParseFormFields| coordinates the parsing and extraction
   // of types from an input vector of |AutofillField| objects and delegates
   // the type extraction via this method.
-  virtual bool ClassifyField(FieldTypeMap* map) const = 0;
+  virtual bool ClassifyField(ServerFieldTypeMap* map) const = 0;
 
  private:
   FRIEND_TEST_ALL_PREFIXES(FormFieldTest, Match);
 
   // Function pointer type for the parsing function that should be passed to the
   // ParseFormFieldsPass() helper function.
   typedef FormField* ParseFunction(AutofillScanner* scanner);
 
   // Matches |pattern| to the contents of the field at the head of the
   // |scanner|.
@@ skipping 10 matching lines @@
                     const base::string16& pattern,
                     int match_type);
 
   // Perform a "pass" over the |fields| where each pass uses the supplied
   // |parse| method to match content to a given field type.
   // |fields| is both an input and an output parameter.  Upon exit |fields|
   // holds any remaining unclassified fields for further processing.
   // Classification results of the processed fields are stored in |map|.
   static void ParseFormFieldsPass(ParseFunction parse,
                                   std::vector<const AutofillField*>* fields,
-                                  FieldTypeMap* map);
+                                  ServerFieldTypeMap* map);
 
   DISALLOW_COPY_AND_ASSIGN(FormField);
 };
 
 }  // namespace autofill
 
 #endif  // COMPONENTS_AUTOFILL_CORE_BROWSER_FORM_FIELD_H_