Reland "Use upstream libaddressinput in Chrome."

components/autofill/core/browser/address_i18n.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 "components/autofill/core/browser/address_i18n.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/logging.h"
 #include "base/strings/string_split.h"
 #include "base/strings/utf_string_conversions.h"
 #include "components/autofill/core/browser/autofill_profile.h"
 #include "components/autofill/core/browser/autofill_type.h"
-#include "third_party/libaddressinput/chromium/cpp/include/libaddressinput/address_data.h"
+#include "third_party/libaddressinput/src/cpp/include/libaddressinput/address_data.h"
 
 namespace autofill {
 namespace i18n {
 
 namespace {
 
 base::string16 GetInfoHelper(const AutofillProfile& profile,
                              const std::string& app_locale,
                              const AutofillType& type) {
   return profile.GetInfo(type, app_locale);
@@ skipping 32 matching lines @@
     CreateAddressDataFromAutofillProfile(const AutofillProfile& profile,
                                          const std::string& app_locale) {
   scoped_ptr< ::i18n::addressinput::AddressData> address_data =
       i18n::CreateAddressData(base::Bind(&GetInfoHelper, profile, app_locale));
   address_data->language_code = profile.language_code();
   return address_data.Pass();
 }
 
 }  // namespace i18n
 }  // namespace autofill