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

chrome/test/data/autofill/heuristics/output/01_autocomplete_attribute_basic.out

Index: chrome/test/data/autofill/heuristics/output/01_autocomplete_attribute_basic.out
diff --git a/chrome/test/data/autofill/heuristics/output/01_autocomplete_attribute_basic.out b/chrome/test/data/autofill/heuristics/output/01_autocomplete_attribute_basic.out
index 7ca141bda6dce949a708cde8aa619e17af2cdfc1..17e5817d43bdd89848ee1088e50ee02068bef146 100644
--- a/chrome/test/data/autofill/heuristics/output/01_autocomplete_attribute_basic.out
+++ b/chrome/test/data/autofill/heuristics/output/01_autocomplete_attribute_basic.out
@@ -1,33 +1,36 @@
-NAME_FULL | na |  | 
+HTML_TYPE_NAME | na |  | 
 UNKNOWN_TYPE | np |  | 
-NAME_FIRST | ng |  | 
-NAME_MIDDLE | nm |  | 
-NAME_MIDDLE_INITIAL | n1 |  | 
-NAME_LAST | nf |  | 
-NAME_SUFFIX | ns |  | 
+HTML_TYPE_GIVEN_NAME | ng |  | 
+HTML_TYPE_ADDITIONAL_NAME | nm |  | 
+HTML_TYPE_ADDITIONAL_NAME_INITIAL | n1 |  | 
+HTML_TYPE_FAMILY_NAME | nf |  | 
+UNKNOWN_TYPE | ns |  | 
 UNKNOWN_TYPE | nn |  | 
 UNKNOWN_TYPE | no |  | 
-COMPANY_NAME | ao |  | 
+HTML_TYPE_ORGANIZATION | ao |  | 
 UNKNOWN_TYPE | af |  | 
-ADDRESS_HOME_LINE1 | a1 |  | 
-ADDRESS_HOME_LINE2 | a2 |  | 
+HTML_TYPE_ADDRESS_LINE1 | a1 |  | 
+HTML_TYPE_ADDRESS_LINE2 | a2 |  | 
 UNKNOWN_TYPE | a3 |  | 
-ADDRESS_HOME_CITY | al |  | 
-ADDRESS_HOME_STATE | ar |  | 
-ADDRESS_HOME_COUNTRY | ac |  | 
-ADDRESS_HOME_ZIP | ap |  | 
-CREDIT_CARD_NAME | cn |  | 
+HTML_TYPE_LOCALITY | al |  | 
+HTML_TYPE_REGION | ar |  | 
+HTML_TYPE_COUNTRY_CODE | ac |  | 
+HTML_TYPE_COUNTRY_NAME | an |  | 
+HTML_TYPE_POSTAL_CODE | ap |  | 
+HTML_TYPE_CREDIT_CARD_NAME | cn |  | 
 UNKNOWN_TYPE | cg |  | 
 UNKNOWN_TYPE | ca |  | 
 UNKNOWN_TYPE | cf |  | 
-CREDIT_CARD_NUMBER | cc |  | 
-CREDIT_CARD_EXP_DATE_4_DIGIT_YEAR | ce |  | 
-CREDIT_CARD_EXP_DATE_2_DIGIT_YEAR | c5 |  | 
-CREDIT_CARD_EXP_MONTH | cm |  | 
-CREDIT_CARD_EXP_4_DIGIT_YEAR | cy |  | 
-CREDIT_CARD_EXP_2_DIGIT_YEAR | c2 |  | 
-CREDIT_CARD_VERIFICATION_CODE | cs |  | 
-CREDIT_CARD_TYPE | ct |  | 
+HTML_TYPE_CREDIT_CARD_NUMBER | cc |  | 
+HTML_TYPE_CREDIT_CARD_EXP | ce |  | 
+HTML_TYPE_CREDIT_CARD_EXP_DATE_2_DIGIT_YEAR | c5 |  | 
+HTML_TYPE_CREDIT_CARD_EXP_DATE_4_DIGIT_YEAR | c7 |  | 
+HTML_TYPE_CREDIT_CARD_EXP_MONTH | cm |  | 
+HTML_TYPE_CREDIT_CARD_EXP_YEAR | cy |  | 
+HTML_TYPE_CREDIT_CARD_EXP_2_DIGIT_YEAR | c2 |  | 
+HTML_TYPE_CREDIT_CARD_EXP_4_DIGIT_YEAR | c4 |  | 
+HTML_TYPE_CREDIT_CARD_VERIFICATION_CODE | cs |  | 
+HTML_TYPE_CREDIT_CARD_TYPE | ct |  | 
 UNKNOWN_TYPE | xl |  | 
 UNKNOWN_TYPE | xb |  | 
 UNKNOWN_TYPE | xd |  | 
@@ -36,13 +39,13 @@ UNKNOWN_TYPE | xy |  |
 UNKNOWN_TYPE | xs |  | 
 UNKNOWN_TYPE | xu |  | 
 UNKNOWN_TYPE | xp |  | 
-EMAIL_ADDRESS | em |  | 
+HTML_TYPE_EMAIL | em |  | 
 UNKNOWN_TYPE | im |  | 
-PHONE_HOME_WHOLE_NUMBER | tt |  | 
-PHONE_HOME_COUNTRY_CODE | tc |  | 
-PHONE_HOME_CITY_AND_NUMBER | tn |  | 
-PHONE_HOME_CITY_CODE | ta |  | 
-PHONE_HOME_NUMBER | tl |  | 
-PHONE_HOME_NUMBER | tp |  | 
-PHONE_HOME_NUMBER | ts |  | 
+HTML_TYPE_TEL | tt |  | 
+HTML_TYPE_TEL_COUNTRY_CODE | tc |  | 
+HTML_TYPE_TEL_NATIONAL | tn |  | 
+HTML_TYPE_TEL_AREA_CODE | ta |  | 
+HTML_TYPE_TEL_LOCAL | tl |  | 
+HTML_TYPE_TEL_LOCAL_PREFIX | tp |  | 
+HTML_TYPE_TEL_LOCAL_SUFFIX | ts |  | 
 UNKNOWN_TYPE | te |  |