[Autofill] Add a separate enumeration for HTML field type hints.

components/autofill/core/browser/autofill_manager_unittest.cc

Index: components/autofill/core/browser/autofill_manager_unittest.cc
diff --git a/components/autofill/core/browser/autofill_manager_unittest.cc b/components/autofill/core/browser/autofill_manager_unittest.cc
index 8c2a8efb0677d7980320e3ef19ea677ab101c00f..ffc7965089618bcec34ea1e2f0eda9c9c8857eca 100644
--- a/components/autofill/core/browser/autofill_manager_unittest.cc
+++ b/components/autofill/core/browser/autofill_manager_unittest.cc
@@ -522,7 +522,7 @@ class TestAutofillManager : public AutofillManager {
                  expected_submitted_field_types_[i].begin();
              it != expected_submitted_field_types_[i].end(); ++it) {
           EXPECT_TRUE(possible_types.count(*it))
-              << "Expected type: " << AutofillType::FieldTypeToString(*it);
+              << "Expected type: " << AutofillType(*it).ToString();
         }
       }
     }
@@ -2652,7 +2652,7 @@ TEST_F(AutofillManagerTest, FormSubmittedServerTypes) {
   std::vector<ServerFieldType> heuristic_types, server_types;
   for (size_t i = 0; i < form.fields.size(); ++i) {
     heuristic_types.push_back(UNKNOWN_TYPE);
-    server_types.push_back(form_structure->field(i)->Type().server_type());
+    server_types.push_back(form_structure->field(i)->heuristic_type());
   }
   form_structure->SetFieldTypes(heuristic_types, server_types);
   autofill_manager_->AddSeenForm(form_structure);
@@ -3166,7 +3166,7 @@ TEST_F(AutofillManagerTest, TestBubbleShown) {
   std::vector<ServerFieldType> heuristic_types, server_types;
   for (size_t i = 0; i < form.fields.size(); ++i) {
     heuristic_types.push_back(UNKNOWN_TYPE);
-    server_types.push_back(form_structure->field(i)->Type().server_type());
+    server_types.push_back(form_structure->field(i)->heuristic_type());
   }
   form_structure->SetFieldTypes(heuristic_types, server_types);
   autofill_manager_->AddSeenForm(form_structure);
@@ -3195,7 +3195,7 @@ TEST_F(AutofillManagerTest, TestAutocheckoutBubbleNotShown) {
   // Build form structure without server data.
   std::vector<ServerFieldType> heuristic_types, server_types;
   for (size_t i = 0; i < form.fields.size(); ++i) {
-    heuristic_types.push_back(form_structure->field(i)->Type().server_type());
+    heuristic_types.push_back(form_structure->field(i)->heuristic_type());
     server_types.push_back(NO_SERVER_DATA);
   }
   form_structure->SetFieldTypes(heuristic_types, server_types);
@@ -3240,7 +3240,7 @@ TEST_F(AutofillManagerTest, DynamicFormsSeenAndIgnored) {
   std::vector<ServerFieldType> heuristic_types, server_types;
   for (size_t i = 0; i < address.fields.size(); ++i) {
     heuristic_types.push_back(UNKNOWN_TYPE);
-    server_types.push_back(form_structure->field(i)->Type().server_type());
+    server_types.push_back(form_structure->field(i)->heuristic_type());
   }
   form_structure->SetFieldTypes(heuristic_types, server_types);
   autofill_manager_->AddSeenForm(form_structure.release());