[Autofill] Add support for three pairs of new server field types.

components/autofill/core/browser/autofill_type.h

Index: components/autofill/core/browser/autofill_type.h
diff --git a/components/autofill/core/browser/autofill_type.h b/components/autofill/core/browser/autofill_type.h
index 41fa613b767185d3ad33e1081a0f63375f6c8dc6..70668ae3eb154dd323e9d966ee8c03976710d046 100644
--- a/components/autofill/core/browser/autofill_type.h
+++ b/components/autofill/core/browser/autofill_type.h
@@ -32,8 +32,8 @@ class AutofillType {
   // data model (in the sense that it makes sense to call
   // |AutofillDataModel::SetRawInfo()| with the returned field type as the first
   // parameter).  Note that the returned type might not be exactly equivalent to
-  // |this| type.  For example, there is no exact analogue to the
-  // 'street-address' HTML type hint among the storable field types.
+  // |this| type.  For example, the HTML types 'country' and 'country-name' both
+  // map to ADDRESS_HOME_COUNTRY.
   ServerFieldType GetStorableType() const;
 
   // Serializes |this| type to a string.