Revert 282408 "Use upstream libaddressinput in Chrome."

trunk/src/components/autofill/core/browser/autofill_country.cc

Index: trunk/src/components/autofill/core/browser/autofill_country.cc
===================================================================
--- trunk/src/components/autofill/core/browser/autofill_country.cc	(revision 282425)
+++ trunk/src/components/autofill/core/browser/autofill_country.cc	(working copy)
@@ -45,9 +45,6 @@
 
 // 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 } },
@@ -69,6 +66,9 @@
   { "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 } },
@@ -663,9 +663,6 @@
   { "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 } },
@@ -907,14 +904,11 @@
        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();
 
-    // 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));
+    common_names_.insert(std::make_pair(country_code, country_code));
+    common_names_.insert(std::make_pair(iso3_country_code, country_code));
   }
 
   // Add a few other common synonyms.