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

components/autofill/core/browser/autofill_type_unittest.cc

Index: components/autofill/core/browser/autofill_type_unittest.cc
diff --git a/components/autofill/core/browser/autofill_type_unittest.cc b/components/autofill/core/browser/autofill_type_unittest.cc
index 8bff67162bd624a2ec78b9294c7ea96119869fa2..d9e8f9e6f03467c448b560d3da6e811883ecb31e 100644
--- a/components/autofill/core/browser/autofill_type_unittest.cc
+++ b/components/autofill/core/browser/autofill_type_unittest.cc
@@ -11,42 +11,42 @@ namespace {
 TEST(AutofillTypeTest, AutofillTypes) {
   // No server data.
   AutofillType none(NO_SERVER_DATA);
-  EXPECT_EQ(NO_SERVER_DATA, none.field_type());
+  EXPECT_EQ(NO_SERVER_DATA, none.server_type());
   EXPECT_EQ(NO_GROUP, none.group());
 
   // Unknown type.
   AutofillType unknown(UNKNOWN_TYPE);
-  EXPECT_EQ(UNKNOWN_TYPE, unknown.field_type());
+  EXPECT_EQ(UNKNOWN_TYPE, unknown.server_type());
   EXPECT_EQ(NO_GROUP, unknown.group());
 
   // Type with group but no subgroup.
   AutofillType first(NAME_FIRST);
-  EXPECT_EQ(NAME_FIRST, first.field_type());
+  EXPECT_EQ(NAME_FIRST, first.server_type());
   EXPECT_EQ(NAME, first.group());
 
   // Type with group and subgroup.
   AutofillType phone(PHONE_HOME_NUMBER);
-  EXPECT_EQ(PHONE_HOME_NUMBER, phone.field_type());
+  EXPECT_EQ(PHONE_HOME_NUMBER, phone.server_type());
   EXPECT_EQ(PHONE_HOME, phone.group());
 
   // Last value, to check any offset errors.
   AutofillType last(COMPANY_NAME);
-  EXPECT_EQ(COMPANY_NAME, last.field_type());
+  EXPECT_EQ(COMPANY_NAME, last.server_type());
   EXPECT_EQ(COMPANY, last.group());
 
   // Boundary (error) condition.
   AutofillType boundary(MAX_VALID_FIELD_TYPE);
-  EXPECT_EQ(UNKNOWN_TYPE, boundary.field_type());
+  EXPECT_EQ(UNKNOWN_TYPE, boundary.server_type());
   EXPECT_EQ(NO_GROUP, boundary.group());
 
   // Beyond the boundary (error) condition.
-  AutofillType beyond(static_cast<AutofillFieldType>(MAX_VALID_FIELD_TYPE+10));
-  EXPECT_EQ(UNKNOWN_TYPE, beyond.field_type());
+  AutofillType beyond(static_cast<ServerFieldType>(MAX_VALID_FIELD_TYPE+10));
+  EXPECT_EQ(UNKNOWN_TYPE, beyond.server_type());
   EXPECT_EQ(NO_GROUP, beyond.group());
 
   // In-between value.  Missing from enum but within range.  Error condition.
-  AutofillType between(static_cast<AutofillFieldType>(16));
-  EXPECT_EQ(UNKNOWN_TYPE, between.field_type());
+  AutofillType between(static_cast<ServerFieldType>(16));
+  EXPECT_EQ(UNKNOWN_TYPE, between.server_type());
   EXPECT_EQ(NO_GROUP, between.group());
 }