Reland "Use upstream libaddressinput in Chrome."

chrome/browser/ui/autofill/country_combobox_model_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/country_combobox_model.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/test/base/testing_profile.h"
 #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 {
 
 class CountryComboboxModelTest : public testing::Test {
  public:
   CountryComboboxModelTest() {
     manager_.Init(NULL, profile_.GetPrefs(), false);
     manager_.set_timezone_country_code("KR");
     model_.reset(new CountryComboboxModel());
     model_->SetCountries(manager_, base::Callback<bool(const std::string&)>());
@@ skipping 12 matching lines @@
 TEST_F(CountryComboboxModelTest, DefaultCountryCode) {
   std::string default_country = model()->GetDefaultCountryCode();
   EXPECT_EQ(manager()->GetDefaultCountryCodeForNewAddress(), default_country);
 
   AutofillCountry country(default_country,
                           g_browser_process->GetApplicationLocale());
   EXPECT_EQ(country.name(), model()->GetItemAt(0));
 }
 
 TEST_F(CountryComboboxModelTest, AllCountriesHaveComponents) {
+  ::i18n::addressinput::Localization localization;
+  std::string unused;
   for (int i = 0; i < model()->GetItemCount(); ++i) {
     if (model()->IsItemSeparatorAt(i))
       continue;
 
     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, std::string(), &unused);
     EXPECT_FALSE(components.empty());
   }
 }
 
 }  // namespace autofill