Use upstream libaddressinput in Chrome.

chrome/browser/ui/autofill/mock_address_validator.h

Index: chrome/browser/ui/autofill/mock_address_validator.h
diff --git a/chrome/browser/ui/autofill/mock_address_validator.h b/chrome/browser/ui/autofill/mock_address_validator.h
index d9585617c4ba6b6e68c06177eee9f96bca7d9ca1..302464c0148e37fa14e3d3497912c3303edd1d34 100644
--- a/chrome/browser/ui/autofill/mock_address_validator.h
+++ b/chrome/browser/ui/autofill/mock_address_validator.h
@@ -5,40 +5,48 @@
 #ifndef CHROME_BROWSER_UI_AUTOFILL_MOCK_ADDRESS_VALIDATOR_H_
 #define CHROME_BROWSER_UI_AUTOFILL_MOCK_ADDRESS_VALIDATOR_H_
 
+#define I18N_ADDRESSINPUT_UTIL_BASICTYPES_H_  // Use base/basictypes.h instead.
+
 #include "base/basictypes.h"
 #include "testing/gmock/include/gmock/gmock.h"
-#include "third_party/libaddressinput/chromium/cpp/include/libaddressinput/address_data.h"
-#include "third_party/libaddressinput/chromium/cpp/include/libaddressinput/address_validator.h"
+#include "third_party/libaddressinput/chromium/preload_address_validator.h"
+#include "third_party/libaddressinput/src/cpp/include/libaddressinput/address_data.h"
 
 namespace autofill {
 
-MATCHER_P(CountryCodeMatcher, country_code, "Checks an AddressData's country") {
+MATCHER_P(CountryCodeMatcher, region_code, "Checks an AddressData's country") {
   // |arg| is an AddressData object.
-  return arg.country_code == country_code;
+  return arg.region_code == region_code;
 }
 
-class MockAddressValidator : public ::i18n::addressinput::AddressValidator {
+class MockAddressValidator : public PreloadAddressValidator {
  public:
   MockAddressValidator();
   virtual ~MockAddressValidator();
 
-  MOCK_METHOD1(LoadRules, void(const std::string& country_code));
+  virtual void LoadRules(const std::string& region_code,
+                         const Callback& /*loaded*/) OVERRIDE {
+    MockLoadRules(region_code);  // Discard callback |loaded|.
+  }
+
+  MOCK_METHOD1(MockLoadRules,
+      void(const std::string& region_code));
 
-  MOCK_CONST_METHOD3(ValidateAddress,
-      ::i18n::addressinput::AddressValidator::Status(
+  MOCK_CONST_METHOD3(Validate,
+      PreloadAddressValidator::Status(
           const ::i18n::addressinput::AddressData& address,
-          const ::i18n::addressinput::AddressProblemFilter& filter,
-          ::i18n::addressinput::AddressProblems* problems));
+          const ::i18n::addressinput::FieldProblemMap* filter,
+          ::i18n::addressinput::FieldProblemMap* problems));
 
   MOCK_CONST_METHOD4(GetSuggestions,
-      ::i18n::addressinput::AddressValidator::Status(
+      PreloadAddressValidator::Status(
           const ::i18n::addressinput::AddressData& user_input,
           ::i18n::addressinput::AddressField focused_field,
           size_t suggestions_limit,
           std::vector< ::i18n::addressinput::AddressData>* suggestions));
 
   MOCK_CONST_METHOD1(CanonicalizeAdministrativeArea,
-                     bool(::i18n::addressinput::AddressData* address_data));
+      bool(::i18n::addressinput::AddressData* address_data));
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MockAddressValidator);