Fix form type classification

Unfillable form fields should not label a form as an "Address form".

Bug: 1043150
Change-Id: I47916142f32eb36df0c08d6897f2d36de3b86df5
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2007811
Commit-Queue: Dominic Battré <battre@chromium.org>
Commit-Queue: Vadym Doroshenko <dvadym@chromium.org>
Auto-Submit: Dominic Battré <battre@chromium.org>
Reviewed-by: Vadym Doroshenko <dvadym@chromium.org>
Cr-Commit-Position: refs/heads/master@{#732926}

components/autofill/core/browser/form_types.cc

@@ -10,6 +10,15 @@ namespace autofill {
 // static
 FormType FormTypes::FieldTypeGroupToFormType(FieldTypeGroup field_type_group) {
   switch (field_type_group) {
+    case NAME:
+    case NAME_BILLING:
+    case EMAIL:
+    case COMPANY:
+    case ADDRESS_HOME:
+    case ADDRESS_BILLING:
+    case PHONE_HOME:
+    case PHONE_BILLING:
+      return ADDRESS_FORM;
     case CREDIT_CARD:
       return CREDIT_CARD_FORM;
     case USERNAME_FIELD:
@@ -17,10 +26,8 @@ FormType FormTypes::FieldTypeGroupToFormType(FieldTypeGroup field_type_group) {
       return PASSWORD_FORM;
     case NO_GROUP:
     case TRANSACTION:
+    case UNFILLABLE:
       return UNKNOWN_FORM_TYPE;
-    default:
-      // Assuming it's an address form by process of elimination.
-      return ADDRESS_FORM;
   }
 }
 }  // namespace autofill