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 48 matching lines @@
             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 667 matching lines @@
             ADDRESS_REQUIRES_CITY } },
   { "VU", { IDS_AUTOFILL_FIELD_LABEL_POSTAL_CODE,
             IDS_AUTOFILL_FIELD_LABEL_PROVINCE,
             ADDRESS_REQUIREMENTS_UNKNOWN } },
   { "WF", { IDS_AUTOFILL_FIELD_LABEL_POSTAL_CODE,
             IDS_AUTOFILL_FIELD_LABEL_PROVINCE,
             ADDRESS_REQUIRES_CITY_ZIP } },
   { "WS", { IDS_AUTOFILL_FIELD_LABEL_POSTAL_CODE,
             IDS_AUTOFILL_FIELD_LABEL_PROVINCE,
             ADDRESS_REQUIREMENTS_UNKNOWN } },
+  { "XK", { IDS_AUTOFILL_FIELD_LABEL_POSTAL_CODE,
+            IDS_AUTOFILL_FIELD_LABEL_PROVINCE,
+            ADDRESS_REQUIREMENTS_UNKNOWN } },
   { "YE", { IDS_AUTOFILL_FIELD_LABEL_POSTAL_CODE,
             IDS_AUTOFILL_FIELD_LABEL_PROVINCE,
             ADDRESS_REQUIRES_CITY } },
   { "YT", { IDS_AUTOFILL_FIELD_LABEL_POSTAL_CODE,
             IDS_AUTOFILL_FIELD_LABEL_PROVINCE,
             ADDRESS_REQUIRES_CITY_ZIP } },
   { "ZA", { IDS_AUTOFILL_FIELD_LABEL_POSTAL_CODE,
             IDS_AUTOFILL_FIELD_LABEL_PROVINCE,
             ADDRESS_REQUIRES_CITY_ZIP } },
   { "ZM", { IDS_AUTOFILL_FIELD_LABEL_POSTAL_CODE,
@@ skipping 268 matching lines @@
     DCHECK_EQ(*buffer_size, expected_size);
   }
 
   return std::string(reinterpret_cast<const char*>(buffer->get()));
 }
 
 }  // namespace
 
 AutofillCountry::AutofillCountry(const std::string& country_code,
                                  const std::string& locale) {
-  const CountryDataMap::Iterator result = CountryDataMap::Find(country_code);
-  DCHECK(result != CountryDataMap::End());
-  const CountryData& data = result->second;
-
   country_code_ = country_code;
   name_ = l10n_util::GetDisplayNameForCountry(country_code, locale);
-  postal_code_label_ = l10n_util::GetStringUTF16(data.postal_code_label_id);
-  state_label_ = l10n_util::GetStringUTF16(data.state_label_id);
-  address_required_fields_ = data.address_required_fields;
+
+  const CountryDataMap::Iterator result = CountryDataMap::Find(country_code);
+  if (result != CountryDataMap::End()) {
+    const CountryData& data = result->second;
+    postal_code_label_ = l10n_util::GetStringUTF16(data.postal_code_label_id);
+    state_label_ = l10n_util::GetStringUTF16(data.state_label_id);
+    address_required_fields_ = data.address_required_fields;
+  } else {
+    postal_code_label_ = state_label_ = base::ASCIIToUTF16("[UNKNOWN]");
+  }

[please use gerrit instead, 2014/06/05 22:22:48]

Investigate: This change be unnecessary after the AN and XK changes in the enum
above.

[please use gerrit instead, 2014/06/09 23:28:16]

Done.

 }
 
 AutofillCountry::~AutofillCountry() {
 }
 
 // static
 void AutofillCountry::GetAvailableCountries(
     std::vector<std::string>* country_codes) {
   DCHECK(country_codes);
 
@@ skipping 36 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