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

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>
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "components/autofill/core/browser/address_field.h"
 #include "components/autofill/core/browser/autofill_field.h"
 #include "components/autofill/core/browser/autofill_regexes.h"
 #include "components/autofill/core/browser/autofill_scanner.h"
 #include "components/autofill/core/browser/credit_card_field.h"
 #include "components/autofill/core/browser/email_field.h"
-#include "components/autofill/core/browser/field_types.h"
 #include "components/autofill/core/browser/form_structure.h"
 #include "components/autofill/core/browser/name_field.h"
 #include "components/autofill/core/browser/phone_field.h"
 #include "ui/base/l10n/l10n_util.h"
 
 namespace autofill {
 namespace {
 
 bool IsTextField(const std::string& type) {
   return type == "text";
@@ skipping 12 matching lines @@
 }
 
 bool IsCheckable(const AutofillField* field) {
   return field->is_checkable;
 }
 
 }  // namespace
 
 // static
 void FormField::ParseFormFields(const std::vector<AutofillField*>& fields,
-                                FieldTypeMap* map) {
+                                ServerFieldTypeMap* map) {
   // Set up a working copy of the fields to be processed.
   std::vector<const AutofillField*> remaining_fields(fields.size());
   std::copy(fields.begin(), fields.end(), remaining_fields.begin());
 
   // Ignore checkable fields as they interfere with parsers assuming context.
   // Eg., while parsing address, "Is PO box" checkbox after ADDRESS_LINE1
   // interferes with correctly understanding ADDRESS_LINE2.
   remaining_fields.erase(
       std::remove_if(remaining_fields.begin(), remaining_fields.end(),
                      IsCheckable),
@@ skipping 53 matching lines @@
 bool FormField::ParseEmptyLabel(AutofillScanner* scanner,
                                 const AutofillField** match) {
   return ParseFieldSpecifics(scanner,
                              ASCIIToUTF16("^$"),
                              MATCH_LABEL | MATCH_ALL_INPUTS,
                              match);
 }
 
 // static
 bool FormField::AddClassification(const AutofillField* field,
-                                  AutofillFieldType type,
-                                  FieldTypeMap* map) {
+                                  ServerFieldType type,
+                                  ServerFieldTypeMap* map) {
   // Several fields are optional.
   if (!field)
     return true;
 
   return map->insert(make_pair(field->unique_name(), type)).second;
 }
 
 // static.
 bool FormField::MatchAndAdvance(AutofillScanner* scanner,
                                 const base::string16& pattern,
@@ skipping 28 matching lines @@
       autofill::MatchesPattern(field->value, pattern)) {
     return true;
   }
 
   return false;
 }
 
 // static
 void FormField::ParseFormFieldsPass(ParseFunction parse,
                                     std::vector<const AutofillField*>* fields,
-                                    FieldTypeMap* map) {
+                                    ServerFieldTypeMap* map) {
   // Store unmatched fields for further processing by the caller.
   std::vector<const AutofillField*> remaining_fields;
 
   AutofillScanner scanner(*fields);
   while (!scanner.IsEnd()) {
     scoped_ptr<FormField> form_field(parse(&scanner));
     if (!form_field.get()) {
       remaining_fields.push_back(scanner.Cursor());
       scanner.Advance();
       continue;
     }
 
     // Add entries into the map for each field type found in |form_field|.
     bool ok = form_field->ClassifyField(map);
     DCHECK(ok);
   }
 
   std::swap(*fields, remaining_fields);
 }
 
 }  // namespace autofill