Use upstream libaddressinput in Chrome.

third_party/libaddressinput/chromium/preload_address_validator.h

 // 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.
 
 #ifndef THIRD_PARTY_LIBADDRESSINPUT_CHROMIUM_PRELOAD_ADDRESS_VALIDATOR_H_
 #define THIRD_PARTY_LIBADDRESSINPUT_CHROMIUM_PRELOAD_ADDRESS_VALIDATOR_H_
 
 #include <cstddef>
 #include <string>
 #include <vector>
 
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "third_party/libaddressinput/src/cpp/include/libaddressinput/address_field.h"
 #include "third_party/libaddressinput/src/cpp/include/libaddressinput/address_validator.h"
 #include "third_party/libaddressinput/src/cpp/include/libaddressinput/callback.h"
 
 namespace i18n {
 namespace addressinput {
-
+class AddressNormalizer;
 class Downloader;
 class PreloadSupplier;
 class Storage;
-class Synonyms;
 struct AddressData;
-
-}  // namespace addressinput
-}  // namespace i18n
+struct AddressInputHelper;
+}
+}
 
 namespace autofill {
 
 class Suggestions;
 
 // Interface to the libaddressinput AddressValidator for Chromium Autofill.
 class PreloadAddressValidator {
  public:
   typedef ::i18n::addressinput::Callback<std::string, int> Callback;
 
@@ skipping 79 matching lines @@
   virtual bool CanonicalizeAdministrativeArea(
       ::i18n::addressinput::AddressData* address) const;
 
  private:
   void Validated(bool success,
                  const ::i18n::addressinput::AddressData&,
                  const ::i18n::addressinput::FieldProblemMap&);
 
   const scoped_ptr< ::i18n::addressinput::PreloadSupplier> supplier_;
   const scoped_ptr<Suggestions> suggestions_;
-  const scoped_ptr< ::i18n::addressinput::Synonyms> synonyms_;
+  const scoped_ptr< ::i18n::addressinput::AddressNormalizer> normalizer_;
   const scoped_ptr<const ::i18n::addressinput::AddressValidator> validator_;
+  const scoped_ptr<const ::i18n::addressinput::AddressInputHelper>
+      input_helper_;
   const scoped_ptr<const ::i18n::addressinput::AddressValidator::Callback>
       validated_;
 
   friend class MockAddressValidator;
   PreloadAddressValidator();
 
   DISALLOW_COPY_AND_ASSIGN(PreloadAddressValidator);
 };
 
 }  // namespace autofill
 
 #endif  // THIRD_PARTY_LIBADDRESSINPUT_CHROMIUM_PRELOAD_ADDRESS_VALIDATOR_H_