[Autofill][Leipzig] Types for structured addresses

This CL adds the types needed for LeipzigV1 and some additional compound
types that will be used to implement the structured address component.


Change-Id: Ic3191f58089ee26c0aed6b86e11490f575d10d9c
Bug: 1099202
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2332701
Commit-Queue: Matthias Körber <koerber@google.com>
Reviewed-by: Dominic Battré <battre@chromium.org>
Cr-Commit-Position: refs/heads/master@{#796082}

components/autofill/core/browser/autofill_type.cc

@@ -61,10 +61,15 @@ FieldTypeGroup GroupTypeOfServerFieldType(ServerFieldType field_type) {
     case ADDRESS_HOME_STREET_ADDRESS:
     case ADDRESS_HOME_SORTING_CODE:
     case ADDRESS_HOME_DEPENDENT_LOCALITY:
-    case ADDRESS_HOME_STREET:
+    case ADDRESS_HOME_STREET_NAME:
+    case ADDRESS_HOME_DEPENDENT_STREET_NAME:
     case ADDRESS_HOME_HOUSE_NUMBER:
+    case ADDRESS_HOME_PREMISE_NAME:
+    case ADDRESS_HOME_STREET_AND_DEPENDENT_STREET_NAME:
     case ADDRESS_HOME_FLOOR:
     case ADDRESS_HOME_OTHER_SUBUNIT:
+    case ADDRESS_HOME_ADDRESS:
+    case ADDRESS_HOME_ADDRESS_WITH_NAME:
       return ADDRESS_HOME;
 
     case ADDRESS_BILLING_LINE1:

components/autofill/core/browser/field_types.cc

@@ -41,10 +41,15 @@ bool IsFillableFieldType(ServerFieldType field_type) {
     case ADDRESS_HOME_STREET_ADDRESS:
     case ADDRESS_HOME_SORTING_CODE:
     case ADDRESS_HOME_DEPENDENT_LOCALITY:
-    case ADDRESS_HOME_STREET:
+    case ADDRESS_HOME_STREET_NAME:
+    case ADDRESS_HOME_DEPENDENT_STREET_NAME:
+    case ADDRESS_HOME_STREET_AND_DEPENDENT_STREET_NAME:
     case ADDRESS_HOME_HOUSE_NUMBER:
+    case ADDRESS_HOME_PREMISE_NAME:
     case ADDRESS_HOME_FLOOR:
     case ADDRESS_HOME_OTHER_SUBUNIT:
+    case ADDRESS_HOME_ADDRESS:
+    case ADDRESS_HOME_ADDRESS_WITH_NAME:
       return true;
 
     // Billing address types that should not be returned by GetStorableType().
@@ -200,6 +205,10 @@ base::StringPiece FieldTypeToStringPiece(ServerFieldType type) {
       return "PHONE_FAX_CITY_AND_NUMBER";
     case PHONE_FAX_WHOLE_NUMBER:
       return "PHONE_FAX_WHOLE_NUMBER";
+    case ADDRESS_HOME_ADDRESS:
+      return "ADDRESS_HOME_ADDRESS";
+    case ADDRESS_HOME_ADDRESS_WITH_NAME:
+      return "ADDRESS_HOME_ADDRESS_WITH_NAME";
     case ADDRESS_HOME_LINE1:
       return "ADDRESS_HOME_LINE1";
     case ADDRESS_HOME_LINE2:
@@ -314,10 +323,16 @@ base::StringPiece FieldTypeToStringPiece(ServerFieldType type) {
       return "NOT_USERNAME";
     case UPI_VPA:
       return "UPI_VPA";
-    case ADDRESS_HOME_STREET:
-      return "ADDRESS_HOME_STREET";
+    case ADDRESS_HOME_STREET_NAME:
+      return "ADDRESS_HOME_STREET_NAME";
+    case ADDRESS_HOME_DEPENDENT_STREET_NAME:
+      return "ADDRESS_HOME_DEPENDENT_STREET_NAME";
     case ADDRESS_HOME_HOUSE_NUMBER:
       return "ADDRESS_HOME_HOUSE_NUMBER";
+    case ADDRESS_HOME_STREET_AND_DEPENDENT_STREET_NAME:
+      return "ADDRESS_HOME_STREET_AND_DEPENDENT_STREET_NAME";
+    case ADDRESS_HOME_PREMISE_NAME:
+      return "ADDRESS_HOME_PREMISE_NAME";
     case ADDRESS_HOME_FLOOR:
       return "ADDRESS_HOME_FLOOR";
     case ADDRESS_HOME_OTHER_SUBUNIT:

components/autofill/core/browser/field_types.h

@@ -191,15 +191,12 @@ enum ServerFieldType {
   UPI_VPA = 102,
 
   // Just the street name of an address, no house number.
-  // Currently not used by Chrome.
-  ADDRESS_HOME_STREET = 103,
+  ADDRESS_HOME_STREET_NAME = 103,
 
   // House number of an address, may be alphanumeric.
-  // Currently not used by Chrome.
   ADDRESS_HOME_HOUSE_NUMBER = 104,
 
   // Floor within in a building, may be alphanumeric.
-  // Currently not used by Chrome.
   ADDRESS_HOME_FLOOR = 105,
 
   // A catch-all for other type of subunits (only used until something more
@@ -215,9 +212,27 @@ enum ServerFieldType {
   // Type to catch name additions like "Mr.", "Ms." or "Dr.".
   NAME_HONORIFIC_PREFIX = 110,
 
+  // Type that corresponds to the name of a place or a building below the
+  // granularity of a street.
+  ADDRESS_HOME_PREMISE_NAME = 111,
+
+  // Type that describes a crossing street as it is used in some countries to
+  // describe a location.
+  ADDRESS_HOME_DEPENDENT_STREET_NAME = 112,
+
+  // Compound type to join the street and dependent street names.
+  ADDRESS_HOME_STREET_AND_DEPENDENT_STREET_NAME = 113,
+
+  // The complete formatted address as it would be written on an envelope or in
+  // a clear-text field without the name.
+  ADDRESS_HOME_ADDRESS = 114,
+
+  // The complete formatted address including the name.
+  ADDRESS_HOME_ADDRESS_WITH_NAME = 115,
+
   // No new types can be added without a corresponding change to the Autofill
   // server.
-  MAX_VALID_FIELD_TYPE = 111,
+  MAX_VALID_FIELD_TYPE = 116,
 };
 
 // The list of all HTML autocomplete field type hints supported by Chrome.