Use upstream libaddressinput in Chrome.

chrome/browser/ui/autofill/autofill_dialog_controller_impl.h

 // Copyright (c) 2012 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 CHROME_BROWSER_UI_AUTOFILL_AUTOFILL_DIALOG_CONTROLLER_IMPL_H_
 #define CHROME_BROWSER_UI_AUTOFILL_AUTOFILL_DIALOG_CONTROLLER_IMPL_H_
 
 #include <set>
 #include <vector>
 
+#include "base/basictypes.h"
 #include "base/gtest_prod_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/strings/string16.h"
 #include "base/time/time.h"
 #include "chrome/browser/ui/autofill/account_chooser_model.h"
 #include "chrome/browser/ui/autofill/autofill_dialog_controller.h"
 #include "chrome/browser/ui/autofill/autofill_dialog_models.h"
 #include "chrome/browser/ui/autofill/autofill_dialog_types.h"
 #include "chrome/browser/ui/autofill/autofill_dialog_view_delegate.h"
 #include "chrome/browser/ui/autofill/autofill_popup_controller_impl.h"
 #include "chrome/browser/ui/autofill/country_combobox_model.h"
 #include "components/autofill/content/browser/wallet/wallet_client.h"
 #include "components/autofill/content/browser/wallet/wallet_client_delegate.h"
 #include "components/autofill/content/browser/wallet/wallet_items.h"
 #include "components/autofill/content/browser/wallet/wallet_signin_helper_delegate.h"
 #include "components/autofill/core/browser/autofill_manager_delegate.h"
 #include "components/autofill/core/browser/autofill_metrics.h"
 #include "components/autofill/core/browser/autofill_popup_delegate.h"
 #include "components/autofill/core/browser/field_types.h"
 #include "components/autofill/core/browser/form_structure.h"
 #include "components/autofill/core/browser/personal_data_manager.h"
 #include "components/autofill/core/browser/personal_data_manager_observer.h"
 #include "content/public/browser/notification_observer.h"
 #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/preload_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"
 #include "ui/gfx/animation/animation_delegate.h"
 #include "ui/gfx/animation/linear_animation.h"
 #include "url/gurl.h"
 
 class Profile;
 
 namespace content {
 class WebContents;
 }
 
+namespace i18n {
+namespace addressinput {
+struct AddressData;
+}
+}
+
 namespace autofill {
 
 class AutofillDataModel;
 class AutofillDialogView;
 class AutofillPopupControllerImpl;
 class DataModelWrapper;
 
 namespace risk {
 class Fingerprint;
 }
 
 namespace wallet {
 class WalletSigninHelper;
 }
 
 // This class drives the dialog that appears when a site uses the imperative
 // autocomplete API to fill out a form.
 class AutofillDialogControllerImpl
     : public AutofillDialogViewDelegate,
       public AutofillDialogController,
       public AutofillPopupDelegate,
       public content::NotificationObserver,
       public content::WebContentsObserver,
       public SuggestionsMenuModelDelegate,
       public wallet::WalletClientDelegate,
       public wallet::WalletSigninHelperDelegate,
       public PersonalDataManagerObserver,
       public AccountChooserModelDelegate,
-      public gfx::AnimationDelegate,
-      public ::i18n::addressinput::LoadRulesDelegate {

[please use gerrit instead, 2014/06/05 22:22:47]

To reduce reviewer burden: Bring back LoadRulesDelegate, but in autofill
namespace.

+      public gfx::AnimationDelegate {
  public:
   virtual ~AutofillDialogControllerImpl();
 
   static base::WeakPtr<AutofillDialogControllerImpl> Create(
       content::WebContents* contents,
       const FormData& form_structure,
       const GURL& source_url,
       const AutofillManagerDelegate::ResultCallback& callback);
 
   // AutofillDialogController implementation.
@@ skipping 118 matching lines @@
   virtual void OnPassiveSigninSuccess() OVERRIDE;
   virtual void OnPassiveSigninFailure(
       const GoogleServiceAuthError& error) OVERRIDE;
   virtual void OnDidFetchWalletCookieValue(
       const std::string& cookie_value) OVERRIDE;
 
   // gfx::AnimationDelegate implementation.
   virtual void AnimationEnded(const gfx::Animation* animation) OVERRIDE;
   virtual void AnimationProgressed(const gfx::Animation* animation) OVERRIDE;
 
-  // ::i18n::addressinput::LoadRulesDelegate implementation.
-  virtual void OnAddressValidationRulesLoaded(const std::string& country_code,
-                                              bool success) OVERRIDE;
+  // PreloadAddressValidator::Callback implementation.
+  void AddressValidationRulesLoaded(bool success,
+                                    const std::string& country_code,
+                                    const int& rule_count);
 
  protected:
   enum DialogSignedInState {
     NOT_CHECKED,
     REQUIRES_RESPONSE,
     REQUIRES_SIGN_IN,
     REQUIRES_PASSIVE_SIGN_IN,
     SIGNED_IN,
     SIGN_IN_DISABLED,
   };
 
   // Exposed for testing.
   AutofillDialogControllerImpl(
       content::WebContents* contents,
       const FormData& form_structure,
       const GURL& source_url,
       const AutofillManagerDelegate::ResultCallback& callback);
 
   // Exposed for testing.
   AutofillDialogView* view() { return view_.get(); }
   virtual AutofillDialogView* CreateView();
   ServerFieldType popup_input_type() const {
     return popup_input_type_;
   }
 
   // Returns the PersonalDataManager for |profile_|.
   virtual PersonalDataManager* GetManager() const;
 
   // Returns an address validation helper. May be NULL during tests.
-  virtual ::i18n::addressinput::AddressValidator* GetValidator();
+  virtual PreloadAddressValidator* GetValidator();
 
   // Returns the WalletClient* this class uses to talk to Online Wallet. Exposed
   // for testing.
   const wallet::WalletClient* GetWalletClient() const;
   virtual wallet::WalletClient* GetWalletClient();
 
   // Call to disable communication to Online Wallet for this dialog.
   // Exposed for testing.
   void DisableWallet(wallet::WalletClient::ErrorType error_type);
 
@@ skipping 383 matching lines @@
   scoped_ptr<AccountChooserModel> account_chooser_model_;
 
   // The sign-in helper to fetch the user's Wallet cookie and to perform passive
   // sign-in. The helper is set only during fetch/sign-in, and NULL otherwise.
   scoped_ptr<wallet::WalletSigninHelper> signin_helper_;
 
   // A client to talk to the Online Wallet API.
   wallet::WalletClient wallet_client_;
 
   // A helper to validate international address input.
-  scoped_ptr< ::i18n::addressinput::AddressValidator> validator_;
+  scoped_ptr<PreloadAddressValidator> validator_;
 
   // True if |this| has ever called GetWalletItems().
   bool wallet_items_requested_;
 
   // True when the user has clicked the "Use Wallet" link and we're waiting to
   // figure out whether we need to ask them to actively sign in.
   bool handling_use_wallet_link_click_;
 
   // True when the current WalletItems has a passive auth action which was
   // attempted and failed.
@@ skipping 158 matching lines @@
 
   // An animation which controls the background fade when the card is done
   // scrambling.
   gfx::LinearAnimation card_generated_animation_;
 
   // A username string we display in the card scrambling/generated overlay.
   base::string16 submitted_cardholder_name_;
 
   base::WeakPtrFactory<AutofillDialogControllerImpl> weak_ptr_factory_;
 
+  const scoped_ptr<PreloadAddressValidator::Callback>
+      address_validation_rules_loaded_;

[please use gerrit instead, 2014/06/05 22:22:47]

To reduce reviewer burden: Use autofill::LoadRulesDelegate instead of
PreloadAddressValidator::Callback address_validation_rules_loaded_.

+
   DISALLOW_COPY_AND_ASSIGN(AutofillDialogControllerImpl);
 };
 
 }  // namespace autofill
 
 #endif  // CHROME_BROWSER_UI_AUTOFILL_AUTOFILL_DIALOG_CONTROLLER_IMPL_H_