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

components/autofill/core/browser/form_structure.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/autofill/core/browser/form_structure.h"
 
 #include <utility>
 
 #include "base/basictypes.h"
 #include "base/command_line.h"
@@ skipping 199 matching lines @@
 
   if (autocomplete_attribute_value == "street-address")
     return HTML_TYPE_STREET_ADDRESS;
 
   if (autocomplete_attribute_value == "address-line1")
     return HTML_TYPE_ADDRESS_LINE1;
 
   if (autocomplete_attribute_value == "address-line2")
     return HTML_TYPE_ADDRESS_LINE2;
 
+  if (autocomplete_attribute_value == "address-line3")
+    return HTML_TYPE_ADDRESS_LINE3;
+
+  // TODO(estade): remove support for "locality" and "region".
   if (autocomplete_attribute_value == "locality")
-    return HTML_TYPE_LOCALITY;
+    return HTML_TYPE_ADDRESS_LEVEL2;
 
   if (autocomplete_attribute_value == "region")
-    return HTML_TYPE_REGION;
+    return HTML_TYPE_ADDRESS_LEVEL1;
+
+  if (autocomplete_attribute_value == "address-level1")
+    return HTML_TYPE_ADDRESS_LEVEL1;
+
+  if (autocomplete_attribute_value == "address-level2")
+    return HTML_TYPE_ADDRESS_LEVEL2;
+
+  if (autocomplete_attribute_value == "address-level3")
+    return HTML_TYPE_ADDRESS_LEVEL3;
 
   if (autocomplete_attribute_value == "country")
     return HTML_TYPE_COUNTRY_CODE;
 
   if (autocomplete_attribute_value == "country-name")
     return HTML_TYPE_COUNTRY_NAME;
 
   if (autocomplete_attribute_value == "postal-code")
     return HTML_TYPE_POSTAL_CODE;
 
@@ skipping 970 matching lines @@
        field != fields_.end(); ++field) {
     FieldTypeGroup field_type_group = (*field)->Type().group();
     if (field_type_group == CREDIT_CARD)
       (*field)->set_section((*field)->section() + "-cc");
     else
       (*field)->set_section((*field)->section() + "-default");
   }
 }
 
 }  // namespace autofill