Use upstream libaddressinput in Chrome.

chrome/browser/ui/autofill/autofill_dialog_i18n_input_unittest.cc

 // Copyright 2014 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 "chrome/browser/ui/autofill/autofill_dialog_i18n_input.h"
 
 #include "components/autofill/core/browser/field_types.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "third_party/libaddressinput/chromium/cpp/include/libaddressinput/address_ui.h"
+#include "third_party/libaddressinput/src/cpp/include/libaddressinput/address_ui.h"
 
 namespace autofill {
 namespace i18ninput {
 
 namespace {
 
 const size_t kNumberOfAddressLinesUS = 6;
 
 }  // namespace
 
 TEST(AutofillDialogI18nInput, USShippingAddress) {
   DetailInputs inputs;
   std::string language_code;
   BuildAddressInputs(common::ADDRESS_TYPE_SHIPPING, "US", &inputs,
                      &language_code);
 
   ASSERT_EQ(kNumberOfAddressLinesUS, inputs.size());
   EXPECT_EQ(NAME_FULL, inputs[0].type);
   EXPECT_EQ(ADDRESS_HOME_COUNTRY, inputs[kNumberOfAddressLinesUS - 1].type);
   EXPECT_EQ("en", language_code);
 }
 
 TEST(AutofillDialogI18nInput, USBillingAddress) {
   DetailInputs inputs;
-  BuildAddressInputs(common::ADDRESS_TYPE_BILLING, "US", &inputs, NULL);
+  std::string language_code;
+  BuildAddressInputs(common::ADDRESS_TYPE_BILLING, "US", &inputs,
+                     &language_code);
 
   ASSERT_EQ(kNumberOfAddressLinesUS, inputs.size());
   EXPECT_EQ(NAME_BILLING_FULL, inputs[0].type);
   EXPECT_EQ(ADDRESS_BILLING_COUNTRY, inputs[kNumberOfAddressLinesUS - 1].type);
 }
 
 TEST(AutofillDialogI18nInput, USCityStateAndZipCodeShareInputRow) {
   DetailInputs inputs;
-  BuildAddressInputs(common::ADDRESS_TYPE_SHIPPING, "US", &inputs, NULL);
+  std::string language_code;
+  BuildAddressInputs(common::ADDRESS_TYPE_SHIPPING, "US", &inputs,
+                     &language_code);
   ASSERT_EQ(kNumberOfAddressLinesUS, inputs.size());
 
   int input_index = 2;
 
   // Inputs before or after [ City ] [ State ] [ Zip ] should be on other lines.
   EXPECT_NE(inputs[input_index - 1].length, DetailInput::SHORT);
 
   const DetailInput& city = inputs[input_index++];
   EXPECT_EQ(ADDRESS_HOME_CITY, city.type);
   EXPECT_EQ(city.length, DetailInput::SHORT);
@@ skipping 16 matching lines @@
                      &language_code);
   for (size_t i = 0; i < inputs.size(); ++i) {
     EXPECT_NE(ADDRESS_HOME_LINE2, inputs[i].type);
   }
   EXPECT_EQ("fr", language_code);
 }
 
 TEST(AutofillDialogI18nInput, FullySupportedCountries) {
   const std::vector<std::string>& regions =
       ::i18n::addressinput::GetRegionCodes();
-  for (size_t i = 0; i < regions.size(); ++i) {
-    bool should_be_supported = !(regions[i] == "KR" || regions[i] == "CN");
-    EXPECT_EQ(should_be_supported, CountryIsFullySupported(regions[i]));
+  for (std::vector<std::string>::const_iterator
+       it = regions.begin(); it != regions.end(); ++it) {
+    // http://crbug.com/340929
+    bool should_be_supported =
+        !(*it == "KR" ||
+          *it == "CN" ||
+          *it == "MX" ||
+          *it == "TH");
+    EXPECT_EQ(should_be_supported, CountryIsFullySupported(*it)) << *it;
   }
 }
 
 }  // namespace i18ninput
 }  // namespace autofill