Use upstream libaddressinput in Chrome.

chrome/browser/ui/autofill/autofill_dialog_controller_impl.h

Index: chrome/browser/ui/autofill/autofill_dialog_controller_impl.h
diff --git a/chrome/browser/ui/autofill/autofill_dialog_controller_impl.h b/chrome/browser/ui/autofill/autofill_dialog_controller_impl.h
index 690df26908d72a749b2960772615d7cbd23e0e4a..561fb6be5bb6d71e683eb814dfa323862c3b1b43 100644
--- a/chrome/browser/ui/autofill/autofill_dialog_controller_impl.h
+++ b/chrome/browser/ui/autofill/autofill_dialog_controller_impl.h
@@ -35,8 +35,7 @@
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "content/public/common/ssl_status.h"
-#include "third_party/libaddressinput/chromium/cpp/include/libaddressinput/address_validator.h"
-#include "third_party/libaddressinput/chromium/cpp/include/libaddressinput/load_rules_delegate.h"
+#include "third_party/libaddressinput/chromium/chrome_address_validator.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/base/models/simple_menu_model.h"
 #include "ui/base/ui_base_types.h"
@@ -50,6 +49,12 @@ namespace content {
 class WebContents;
 }
 
+namespace i18n {
+namespace addressinput {
+struct AddressData;
+}
+}
+
 namespace autofill {
 
 class AutofillDataModel;
@@ -79,7 +84,7 @@ class AutofillDialogControllerImpl
       public PersonalDataManagerObserver,
       public AccountChooserModelDelegate,
       public gfx::AnimationDelegate,
-      public ::i18n::addressinput::LoadRulesDelegate {
+      public LoadRulesListener {
  public:
   virtual ~AutofillDialogControllerImpl();
 
@@ -218,7 +223,7 @@ class AutofillDialogControllerImpl
   virtual void AnimationEnded(const gfx::Animation* animation) OVERRIDE;
   virtual void AnimationProgressed(const gfx::Animation* animation) OVERRIDE;
 
-  // ::i18n::addressinput::LoadRulesDelegate implementation.
+  // LoadRulesListener implementation.
   virtual void OnAddressValidationRulesLoaded(const std::string& country_code,
                                               bool success) OVERRIDE;
 
@@ -249,7 +254,7 @@ class AutofillDialogControllerImpl
   virtual PersonalDataManager* GetManager() const;
 
   // Returns an address validation helper. May be NULL during tests.
-  virtual ::i18n::addressinput::AddressValidator* GetValidator();
+  virtual AddressValidator* GetValidator();
 
   // Returns the WalletClient* this class uses to talk to Online Wallet. Exposed
   // for testing.
@@ -655,7 +660,7 @@ class AutofillDialogControllerImpl
   wallet::WalletClient wallet_client_;
 
   // A helper to validate international address input.
-  scoped_ptr< ::i18n::addressinput::AddressValidator> validator_;
+  scoped_ptr<AddressValidator> validator_;
 
   // True if |this| has ever called GetWalletItems().
   bool wallet_items_requested_;