Reland "Use upstream libaddressinput in Chrome."

components/autofill/core/browser/autofill_country.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/autofill_country.h"
 
 #include <stddef.h>
 #include <stdint.h>
 #include <map>
 #include <utility>
@@ skipping 27 matching lines @@
   AddressRequiredFields address_required_fields;
 };
 
 struct StaticCountryData {
   char country_code[3];
   CountryData country_data;
 };
 
 // Maps country codes to localized label string identifiers.
 const StaticCountryData kCountryData[] = {
+  { "AC", { IDS_AUTOFILL_FIELD_LABEL_POSTAL_CODE,
+            IDS_AUTOFILL_FIELD_LABEL_PROVINCE,
+            ADDRESS_REQUIRES_CITY } },
   { "AD", { IDS_AUTOFILL_FIELD_LABEL_POSTAL_CODE,
             IDS_AUTOFILL_FIELD_LABEL_PARISH,
             ADDRESS_REQUIRES_STATE } },
   { "AE", { IDS_AUTOFILL_FIELD_LABEL_POSTAL_CODE,
             IDS_AUTOFILL_FIELD_LABEL_EMIRATE,
             ADDRESS_REQUIRES_STATE } },
   { "AF", { IDS_AUTOFILL_FIELD_LABEL_POSTAL_CODE,
             IDS_AUTOFILL_FIELD_LABEL_PROVINCE,
             ADDRESS_REQUIREMENTS_UNKNOWN } },
   { "AG", { IDS_AUTOFILL_FIELD_LABEL_POSTAL_CODE,
             IDS_AUTOFILL_FIELD_LABEL_PROVINCE,
             ADDRESS_REQUIRES_ADDRESS_LINE_1_ONLY } },
   { "AI", { IDS_AUTOFILL_FIELD_LABEL_POSTAL_CODE,
             IDS_AUTOFILL_FIELD_LABEL_PROVINCE,
             ADDRESS_REQUIREMENTS_UNKNOWN } },
   { "AL", { IDS_AUTOFILL_FIELD_LABEL_POSTAL_CODE,
             IDS_AUTOFILL_FIELD_LABEL_PROVINCE,
             ADDRESS_REQUIREMENTS_UNKNOWN } },
   { "AM", { IDS_AUTOFILL_FIELD_LABEL_POSTAL_CODE,
             IDS_AUTOFILL_FIELD_LABEL_PROVINCE,
             ADDRESS_REQUIREMENTS_UNKNOWN } },
-  { "AN", { IDS_AUTOFILL_FIELD_LABEL_POSTAL_CODE,
-            IDS_AUTOFILL_FIELD_LABEL_PROVINCE,
-            ADDRESS_REQUIREMENTS_UNKNOWN } },
   { "AO", { IDS_AUTOFILL_FIELD_LABEL_POSTAL_CODE,
             IDS_AUTOFILL_FIELD_LABEL_PROVINCE,
             ADDRESS_REQUIREMENTS_UNKNOWN } },
   { "AQ", { IDS_AUTOFILL_FIELD_LABEL_POSTAL_CODE,
             IDS_AUTOFILL_FIELD_LABEL_PROVINCE,
             ADDRESS_REQUIREMENTS_UNKNOWN } },
   { "AR", { IDS_AUTOFILL_FIELD_LABEL_POSTAL_CODE,
             IDS_AUTOFILL_FIELD_LABEL_STATE,
             ADDRESS_REQUIREMENTS_UNKNOWN } },
   { "AS", { IDS_AUTOFILL_FIELD_LABEL_ZIP_CODE,
@@ skipping 574 matching lines @@
             ADDRESS_REQUIREMENTS_UNKNOWN } },
   { "ST", { IDS_AUTOFILL_FIELD_LABEL_POSTAL_CODE,
             IDS_AUTOFILL_FIELD_LABEL_PROVINCE,
             ADDRESS_REQUIREMENTS_UNKNOWN } },
   { "SV", { IDS_AUTOFILL_FIELD_LABEL_POSTAL_CODE,
             IDS_AUTOFILL_FIELD_LABEL_PROVINCE,
             ADDRESS_REQUIRES_CITY_STATE } },
   { "SZ", { IDS_AUTOFILL_FIELD_LABEL_POSTAL_CODE,
             IDS_AUTOFILL_FIELD_LABEL_PROVINCE,
             ADDRESS_REQUIREMENTS_UNKNOWN } },
+  { "TA", { IDS_AUTOFILL_FIELD_LABEL_POSTAL_CODE,
+            IDS_AUTOFILL_FIELD_LABEL_PROVINCE,
+            ADDRESS_REQUIRES_CITY } },
   { "TC", { IDS_AUTOFILL_FIELD_LABEL_POSTAL_CODE,
             IDS_AUTOFILL_FIELD_LABEL_PROVINCE,
             ADDRESS_REQUIRES_CITY_ZIP } },
   { "TD", { IDS_AUTOFILL_FIELD_LABEL_POSTAL_CODE,
             IDS_AUTOFILL_FIELD_LABEL_PROVINCE,
             ADDRESS_REQUIREMENTS_UNKNOWN } },
   { "TF", { IDS_AUTOFILL_FIELD_LABEL_POSTAL_CODE,
             IDS_AUTOFILL_FIELD_LABEL_PROVINCE,
             ADDRESS_REQUIREMENTS_UNKNOWN } },
   { "TG", { IDS_AUTOFILL_FIELD_LABEL_POSTAL_CODE,
@@ skipping 221 matching lines @@
 CountryNames* CountryNames::GetInstance() {
   return Singleton<CountryNames>::get();
 }
 
 CountryNames::CountryNames() {
   // Add 2- and 3-letter ISO country codes.
   for (CountryDataMap::Iterator it = CountryDataMap::Begin();
        it != CountryDataMap::End();
        ++it) {
     const std::string& country_code = it->first;
+    common_names_.insert(std::make_pair(country_code, country_code));
+
     std::string iso3_country_code =
         icu::Locale(NULL, country_code.c_str()).getISO3Country();
 
-    common_names_.insert(std::make_pair(country_code, country_code));
-    common_names_.insert(std::make_pair(iso3_country_code, country_code));
+    // ICU list of countries can be out-of-date with CLDR.
+    if (!iso3_country_code.empty())
+      common_names_.insert(std::make_pair(iso3_country_code, country_code));
   }
 
   // Add a few other common synonyms.
   common_names_.insert(std::make_pair("UNITED STATES OF AMERICA", "US"));
   common_names_.insert(std::make_pair("U.S.A.", "US"));
   common_names_.insert(std::make_pair("GREAT BRITAIN", "GB"));
   common_names_.insert(std::make_pair("UK", "GB"));
   common_names_.insert(std::make_pair("BRASIL", "BR"));
   common_names_.insert(std::make_pair("DEUTSCHLAND", "DE"));
 }
@@ skipping 180 matching lines @@
                                  const base::string16& name,
                                  const base::string16& postal_code_label,
                                  const base::string16& state_label)
     : country_code_(country_code),
       name_(name),
       postal_code_label_(postal_code_label),
       state_label_(state_label) {
 }
 
 }  // namespace autofill