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

components/autofill/core/browser/phone_field.cc

Index: components/autofill/core/browser/phone_field.cc
diff --git a/components/autofill/core/browser/phone_field.cc b/components/autofill/core/browser/phone_field.cc
index ee1e4e6c0dd6045443578991fa26dbf31cd827d6..6d156e909c32e6d28e0fdc306415e2ab94ab759f 100644
--- a/components/autofill/core/browser/phone_field.cc
+++ b/components/autofill/core/browser/phone_field.cc
@@ -196,7 +196,7 @@ FormField* PhoneField::Parse(AutofillScanner* scanner) {
   return phone_field.release();
 }
 
-bool PhoneField::ClassifyField(FieldTypeMap* map) const {
+bool PhoneField::ClassifyField(ServerFieldTypeMap* map) const {
   bool ok = true;
 
   DCHECK(parsed_phone_fields_[FIELD_PHONE]);  // Phone was correctly parsed.
@@ -210,7 +210,7 @@ bool PhoneField::ClassifyField(FieldTypeMap* map) const {
                                    map);
     }
 
-    AutofillFieldType field_number_type = PHONE_HOME_NUMBER;
+    ServerFieldType field_number_type = PHONE_HOME_NUMBER;
     if (parsed_phone_fields_[FIELD_AREA_CODE] != NULL) {
       ok = ok && AddClassification(parsed_phone_fields_[FIELD_AREA_CODE],
                                    PHONE_HOME_CITY_CODE,