autocomplete: support address-line3, address-level{1,2,3}

components/autofill/core/browser/autofill_type.cc

Index: components/autofill/core/browser/autofill_type.cc
diff --git a/components/autofill/core/browser/autofill_type.cc b/components/autofill/core/browser/autofill_type.cc
index d10bc04abaea1e02c794e5df22c1bf1dcf1d36e7..8b6b603096fcfc476da8b54063a7e3d11973cd7a 100644
--- a/components/autofill/core/browser/autofill_type.cc
+++ b/components/autofill/core/browser/autofill_type.cc
@@ -78,6 +78,7 @@ FieldTypeGroup AutofillType::group() const {
 
     case ADDRESS_HOME_LINE1:
     case ADDRESS_HOME_LINE2:
+    case ADDRESS_HOME_LINE3:
     case ADDRESS_HOME_APT_NUM:
     case ADDRESS_HOME_CITY:
     case ADDRESS_HOME_STATE:
@@ -90,6 +91,7 @@ FieldTypeGroup AutofillType::group() const {
 
     case ADDRESS_BILLING_LINE1:
     case ADDRESS_BILLING_LINE2:
+    case ADDRESS_BILLING_LINE3:
     case ADDRESS_BILLING_APT_NUM:
     case ADDRESS_BILLING_CITY:
     case ADDRESS_BILLING_STATE:
@@ -152,8 +154,10 @@ FieldTypeGroup AutofillType::group() const {
     case HTML_TYPE_STREET_ADDRESS:
     case HTML_TYPE_ADDRESS_LINE1:
     case HTML_TYPE_ADDRESS_LINE2:
-    case HTML_TYPE_LOCALITY:
-    case HTML_TYPE_REGION:
+    case HTML_TYPE_ADDRESS_LINE3:
+    case HTML_TYPE_ADDRESS_LEVEL1:
+    case HTML_TYPE_ADDRESS_LEVEL2:
+    case HTML_TYPE_ADDRESS_LEVEL3:
     case HTML_TYPE_COUNTRY_CODE:
     case HTML_TYPE_COUNTRY_NAME:
     case HTML_TYPE_POSTAL_CODE:
@@ -205,6 +209,9 @@ ServerFieldType AutofillType::GetStorableType() const {
     case ADDRESS_BILLING_LINE2:
       return ADDRESS_HOME_LINE2;
 
+    case ADDRESS_BILLING_LINE3:
+      return ADDRESS_HOME_LINE3;
+
     case ADDRESS_BILLING_APT_NUM:
       return ADDRESS_HOME_APT_NUM;
 
@@ -297,12 +304,18 @@ ServerFieldType AutofillType::GetStorableType() const {
     case HTML_TYPE_ADDRESS_LINE2:
       return ADDRESS_HOME_LINE2;
 
-    case HTML_TYPE_LOCALITY:
-      return ADDRESS_HOME_CITY;
+    case HTML_TYPE_ADDRESS_LINE3:
+      return ADDRESS_HOME_LINE3;
 
-    case HTML_TYPE_REGION:
+    case HTML_TYPE_ADDRESS_LEVEL1:
       return ADDRESS_HOME_STATE;
 
+    case HTML_TYPE_ADDRESS_LEVEL2:
+      return ADDRESS_HOME_CITY;
+
+    case HTML_TYPE_ADDRESS_LEVEL3:
+      return ADDRESS_HOME_DEPENDENT_LOCALITY;
+
     case HTML_TYPE_COUNTRY_CODE:
     case HTML_TYPE_COUNTRY_NAME:
       return ADDRESS_HOME_COUNTRY;
@@ -508,6 +521,8 @@ std::string AutofillType::ToString() const {
       return "ADDRESS_HOME_LINE1";
     case ADDRESS_HOME_LINE2:
       return "ADDRESS_HOME_LINE2";
+    case ADDRESS_HOME_LINE3:
+      return "ADDRESS_HOME_LINE3";
     case ADDRESS_HOME_APT_NUM:
       return "ADDRESS_HOME_APT_NUM";
     case ADDRESS_HOME_CITY:
@@ -522,6 +537,8 @@ std::string AutofillType::ToString() const {
       return "ADDRESS_BILLING_LINE1";
     case ADDRESS_BILLING_LINE2:
       return "ADDRESS_BILLING_LINE2";
+    case ADDRESS_BILLING_LINE3:
+      return "ADDRESS_BILLING_LINE3";
     case ADDRESS_BILLING_APT_NUM:
       return "ADDRESS_BILLING_APT_NUM";
     case ADDRESS_BILLING_CITY:
@@ -609,10 +626,14 @@ std::string AutofillType::ToString() const {
       return "HTML_TYPE_ADDRESS_LINE1";
     case HTML_TYPE_ADDRESS_LINE2:
       return "HTML_TYPE_ADDRESS_LINE2";
-    case HTML_TYPE_LOCALITY:
-      return "HTML_TYPE_LOCALITY";
-    case HTML_TYPE_REGION:
-      return "HTML_TYPE_REGION";
+    case HTML_TYPE_ADDRESS_LINE3:
+      return "HTML_TYPE_ADDRESS_LINE3";
+    case HTML_TYPE_ADDRESS_LEVEL1:
+      return "HTML_TYPE_ADDRESS_LEVEL1";
+    case HTML_TYPE_ADDRESS_LEVEL2:
+      return "HTML_TYPE_ADDRESS_LEVEL2";
+    case HTML_TYPE_ADDRESS_LEVEL3:
+      return "HTML_TYPE_ADDRESS_LEVEL3";
     case HTML_TYPE_COUNTRY_CODE:
       return "HTML_TYPE_COUNTRY_CODE";
     case HTML_TYPE_COUNTRY_NAME: