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

components/autofill/core/browser/name_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/name_field.h"
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "components/autofill/core/browser/autofill_regex_constants.h"
 #include "components/autofill/core/browser/autofill_scanner.h"
 #include "components/autofill/core/browser/autofill_type.h"
 #include "ui/base/l10n/l10n_util.h"
 
 namespace autofill {
 namespace {
 
 // A form field that can parse a full name field.
 class FullNameField : public NameField {
  public:
   static FullNameField* Parse(AutofillScanner* scanner);
 
  protected:
   // FormField:
-  virtual bool ClassifyField(FieldTypeMap* map) const OVERRIDE;
+  virtual bool ClassifyField(ServerFieldTypeMap* map) const OVERRIDE;
 
  private:
   explicit FullNameField(const AutofillField* field);
 
   const AutofillField* field_;
 
   DISALLOW_COPY_AND_ASSIGN(FullNameField);
 };
 
 // A form field that can parse a first and last name field.
 class FirstLastNameField : public NameField {
  public:
   static FirstLastNameField* ParseSpecificName(AutofillScanner* scanner);
   static FirstLastNameField* ParseComponentNames(AutofillScanner* scanner);
   static FirstLastNameField* Parse(AutofillScanner* scanner);
 
  protected:
   // FormField:
-  virtual bool ClassifyField(FieldTypeMap* map) const OVERRIDE;
+  virtual bool ClassifyField(ServerFieldTypeMap* map) const OVERRIDE;
 
  private:
   FirstLastNameField();
 
   const AutofillField* first_name_;
   const AutofillField* middle_name_;  // Optional.
   const AutofillField* last_name_;
   bool middle_initial_;  // True if middle_name_ is a middle initial.
 
   DISALLOW_COPY_AND_ASSIGN(FirstLastNameField);
 };
 
 }  // namespace
 
 FormField* NameField::Parse(AutofillScanner* scanner) {
   if (scanner->IsEnd())
     return NULL;
 
   // Try FirstLastNameField first since it's more specific.
   NameField* field = FirstLastNameField::Parse(scanner);
   if (!field)
     field = FullNameField::Parse(scanner);
   return field;
 }
 
 // This is overriden in concrete subclasses.
-bool NameField::ClassifyField(FieldTypeMap* map) const {
+bool NameField::ClassifyField(ServerFieldTypeMap* map) const {
   return false;
 }
 
 FullNameField* FullNameField::Parse(AutofillScanner* scanner) {
   // Exclude e.g. "username" or "nickname" fields.
   scanner->SaveCursor();
   bool should_ignore = ParseField(scanner,
                                   UTF8ToUTF16(autofill::kNameIgnoredRe), NULL);
   scanner->Rewind();
   if (should_ignore)
     return NULL;
 
   // Searching for any label containing the word "name" is too general;
   // for example, Travelocity_Edit travel profile.html contains a field
   // "Travel Profile Name".
   const AutofillField* field = NULL;
   if (ParseField(scanner, UTF8ToUTF16(autofill::kNameRe), &field))
     return new FullNameField(field);
 
   return NULL;
 }
 
-bool FullNameField::ClassifyField(FieldTypeMap* map) const {
+bool FullNameField::ClassifyField(ServerFieldTypeMap* map) const {
   return AddClassification(field_, NAME_FULL, map);
 }
 
 FullNameField::FullNameField(const AutofillField* field)
     : field_(field) {
 }
 
 FirstLastNameField* FirstLastNameField::ParseSpecificName(
     AutofillScanner* scanner) {
   // Some pages (e.g. Overstock_comBilling.html, SmithsonianCheckout.html)
@@ skipping 93 matching lines @@
   return field;
 }
 
 FirstLastNameField::FirstLastNameField()
     : first_name_(NULL),
       middle_name_(NULL),
       last_name_(NULL),
       middle_initial_(false) {
 }
 
-bool FirstLastNameField::ClassifyField(FieldTypeMap* map) const {
+bool FirstLastNameField::ClassifyField(ServerFieldTypeMap* map) const {
   bool ok = AddClassification(first_name_, NAME_FIRST, map);
   ok = ok && AddClassification(last_name_, NAME_LAST, map);
-  AutofillFieldType type = middle_initial_ ? NAME_MIDDLE_INITIAL : NAME_MIDDLE;
+  ServerFieldType type = middle_initial_ ? NAME_MIDDLE_INITIAL : NAME_MIDDLE;
   ok = ok && AddClassification(middle_name_, type, map);
   return ok;
 }
 
 }  // namespace autofill