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

components/autofill/core/browser/contact_info.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/contact_info.h"
 
 #include <stddef.h>
 #include <ostream>
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/logging.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "components/autofill/core/browser/autofill_type.h"
-#include "components/autofill/core/browser/field_types.h"
 
 namespace autofill {
 
-static const AutofillFieldType kAutofillNameInfoTypes[] = {
+static const ServerFieldType kAutofillNameInfoTypes[] = {
   NAME_FIRST,
   NAME_MIDDLE,
   NAME_LAST
 };
 
 static const size_t kAutofillNameInfoLength =
     arraysize(kAutofillNameInfoTypes);
 
 NameInfo::NameInfo() {}
 
 NameInfo::NameInfo(const NameInfo& info) : FormGroup() {
   *this = info;
 }
 
 NameInfo::~NameInfo() {}
 
 NameInfo& NameInfo::operator=(const NameInfo& info) {
   if (this == &info)
     return *this;
 
   first_ = info.first_;
   middle_ = info.middle_;
   last_ = info.last_;
   return *this;
 }
 
-void NameInfo::GetSupportedTypes(FieldTypeSet* supported_types) const {
+void NameInfo::GetSupportedTypes(ServerFieldTypeSet* supported_types) const {
   supported_types->insert(NAME_FIRST);
   supported_types->insert(NAME_MIDDLE);
   supported_types->insert(NAME_LAST);
   supported_types->insert(NAME_MIDDLE_INITIAL);
   supported_types->insert(NAME_FULL);
 }
 
-base::string16 NameInfo::GetRawInfo(AutofillFieldType type) const {
+base::string16 NameInfo::GetRawInfo(ServerFieldType type) const {
   type = AutofillType::GetEquivalentFieldType(type);
   if (type == NAME_FIRST)
     return first();
 
   if (type == NAME_MIDDLE)
     return middle();
 
   if (type == NAME_LAST)
     return last();
 
   if (type == NAME_MIDDLE_INITIAL)
     return MiddleInitial();
 
   if (type == NAME_FULL)
     return FullName();
 
   return base::string16();
 }
 
-void NameInfo::SetRawInfo(AutofillFieldType type, const base::string16& value) {
+void NameInfo::SetRawInfo(ServerFieldType type, const base::string16& value) {
   type = AutofillType::GetEquivalentFieldType(type);
   DCHECK_EQ(NAME, AutofillType(type).group());
   if (type == NAME_FIRST)
     first_ = value;
   else if (type == NAME_MIDDLE || type == NAME_MIDDLE_INITIAL)
     middle_ = value;
   else if (type == NAME_LAST)
     last_ = value;
   else if (type == NAME_FULL)
     SetFullName(value);
@@ skipping 58 matching lines @@
 EmailInfo::~EmailInfo() {}
 
 EmailInfo& EmailInfo::operator=(const EmailInfo& info) {
   if (this == &info)
     return *this;
 
   email_ = info.email_;
   return *this;
 }
 
-void EmailInfo::GetSupportedTypes(FieldTypeSet* supported_types) const {
+void EmailInfo::GetSupportedTypes(ServerFieldTypeSet* supported_types) const {
   supported_types->insert(EMAIL_ADDRESS);
 }
 
-base::string16 EmailInfo::GetRawInfo(AutofillFieldType type) const {
+base::string16 EmailInfo::GetRawInfo(ServerFieldType type) const {
   if (type == EMAIL_ADDRESS)
     return email_;
 
   return base::string16();
 }
 
-void EmailInfo::SetRawInfo(AutofillFieldType type,
-                           const base::string16& value) {
+void EmailInfo::SetRawInfo(ServerFieldType type, const base::string16& value) {
   DCHECK_EQ(EMAIL_ADDRESS, type);
   email_ = value;
 }
 
 CompanyInfo::CompanyInfo() {}
 
 CompanyInfo::CompanyInfo(const CompanyInfo& info) : FormGroup() {
   *this = info;
 }
 
 CompanyInfo::~CompanyInfo() {}
 
 CompanyInfo& CompanyInfo::operator=(const CompanyInfo& info) {
   if (this == &info)
     return *this;
 
   company_name_ = info.company_name_;
   return *this;
 }
 
-void CompanyInfo::GetSupportedTypes(FieldTypeSet* supported_types) const {
+void CompanyInfo::GetSupportedTypes(ServerFieldTypeSet* supported_types) const {
   supported_types->insert(COMPANY_NAME);
 }
 
-base::string16 CompanyInfo::GetRawInfo(AutofillFieldType type) const {
+base::string16 CompanyInfo::GetRawInfo(ServerFieldType type) const {
   if (type == COMPANY_NAME)
     return company_name_;
 
   return base::string16();
 }
 
-void CompanyInfo::SetRawInfo(AutofillFieldType type,
+void CompanyInfo::SetRawInfo(ServerFieldType type,
                              const base::string16& value) {
   DCHECK_EQ(COMPANY_NAME, type);
   company_name_ = value;
 }
 
 }  // namespace autofill