Use upstream libaddressinput in Chrome.

chrome/browser/ui/autofill/country_combobox_model_unittest.cc

Index: chrome/browser/ui/autofill/country_combobox_model_unittest.cc
diff --git a/chrome/browser/ui/autofill/country_combobox_model_unittest.cc b/chrome/browser/ui/autofill/country_combobox_model_unittest.cc
index 56ebd857c0e53aec66b2ce5b106e848a80788a69..0158122b3322a82445605574300c14bb7dc78e59 100644
--- a/chrome/browser/ui/autofill/country_combobox_model_unittest.cc
+++ b/chrome/browser/ui/autofill/country_combobox_model_unittest.cc
@@ -10,8 +10,9 @@
 #include "components/autofill/core/browser/autofill_country.h"
 #include "components/autofill/core/browser/test_personal_data_manager.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "third_party/libaddressinput/chromium/cpp/include/libaddressinput/address_ui.h"
-#include "third_party/libaddressinput/chromium/cpp/include/libaddressinput/address_ui_component.h"
+#include "third_party/libaddressinput/src/cpp/include/libaddressinput/address_ui.h"
+#include "third_party/libaddressinput/src/cpp/include/libaddressinput/address_ui_component.h"
+#include "third_party/libaddressinput/src/cpp/include/libaddressinput/localization.h"
 
 namespace autofill {
 
@@ -44,6 +45,8 @@ TEST_F(CountryComboboxModelTest, DefaultCountryCode) {
 }
 
 TEST_F(CountryComboboxModelTest, AllCountriesHaveComponents) {
+  ::i18n::addressinput::Localization localization;
+  std::string best_address_language;
   for (int i = 0; i < model()->GetItemCount(); ++i) {
     if (model()->IsItemSeparatorAt(i))
       continue;
@@ -51,7 +54,7 @@ TEST_F(CountryComboboxModelTest, AllCountriesHaveComponents) {
     std::string country_code = model()->countries()[i]->country_code();
     std::vector< ::i18n::addressinput::AddressUiComponent> components =
         ::i18n::addressinput::BuildComponents(
-            country_code, std::string(), NULL);
+             country_code, localization, &best_address_language);

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

Reduce reviewer burden: NULL should be OK here.

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

Nope, that's a libaddressinput function.

     EXPECT_FALSE(components.empty());
   }
 }