rAc: use libaddressinput to validate international addresses.

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/callback.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/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 {
@@ skipping 10 matching lines @@
 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 {
+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 {
  public:
   virtual ~AutofillDialogControllerImpl();
 
   static base::WeakPtr<AutofillDialogControllerImpl> Create(
       content::WebContents* contents,
       const FormData& form_structure,
       const GURL& source_url,
       const base::Callback<void(const FormStructure*)>& callback);
 
   // AutofillDialogController implementation.
@@ skipping 120 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;
+
  protected:
   enum DialogSignedInState {
     NOT_CHECKED,
     REQUIRES_RESPONSE,
     REQUIRES_SIGN_IN,
     REQUIRES_PASSIVE_SIGN_IN,
     SIGNED_IN,
     SIGN_IN_DISABLED,
   };
 
@@ skipping 12 matching lines @@
   }
 
   // Returns the PersonalDataManager for |profile_|.
   virtual PersonalDataManager* GetManager() const;
 
   // Returns the WalletClient* this class uses to talk to Online Wallet. Exposed
   // for testing.
   const wallet::WalletClient* GetWalletClient() const;
   virtual wallet::WalletClient* GetWalletClient();
 
+  // Returns an address validation helper. May be NULL during tests.
+  virtual ::i18n::addressinput::AddressValidator* GetValidator();
+
   // Call to disable communication to Online Wallet for this dialog.
   // Exposed for testing.
   void DisableWallet(wallet::WalletClient::ErrorType error_type);
 
   // Returns whether Wallet is the current data source. Exposed for testing.
   virtual bool IsPayingWithWallet() const;
 
   // Asks risk module to asynchronously load fingerprint data. Data will be
   // returned via |OnDidLoadRiskFingerprintData()|. Exposed for testing.
   virtual void LoadRiskFingerprintData();
@@ skipping 47 matching lines @@
   AccountChooserModel* AccountChooserModelForTesting();
 
   // Returns whether |url| matches the sign in continue URL. If so, also fills
   // in |user_index| with the index of the user account that just signed in.
   virtual bool IsSignInContinueUrl(const GURL& url, size_t* user_index) const;
 
   // Whether the user is known to be signed in.
   DialogSignedInState SignedInState() const;
 
  private:
+  FRIEND_TEST_ALL_PREFIXES(AutofillDialogControllerI18nTest,
+                           CorrectCountryFromInputs);
+
   // Initializes or updates |suggested_cc_| et al.
   void SuggestionsUpdated();
 
   // Starts fetching the wallet items from Online Wallet.
   void GetWalletItems();
 
   // Stop showing sign in flow.
   void HideSignIn();
 
   // Handles the SignedInState() on Wallet or sign-in state update.
@@ skipping 361 matching lines @@
   base::WeakPtr<AutofillPopupControllerImpl> popup_controller_;
 
   // The type of the visible Autofill popup input (or UNKNOWN_TYPE if none).
   ServerFieldType popup_input_type_;
 
   scoped_ptr<AutofillDialogView> view_;
 
   // A NotificationRegistrar for tracking the completion of sign-in.
   content::NotificationRegistrar signin_registrar_;
 
-  base::WeakPtrFactory<AutofillDialogControllerImpl> weak_ptr_factory_;
-
   // Set to true when the user presses the sign in link, until we're ready to
   // show the normal dialog again. This is used to hide the buttons while
   // the spinner is showing after an explicit sign in.
   bool waiting_for_explicit_sign_in_response_;
 
   // Whether a user accepted legal documents while this dialog is running.
   bool has_accepted_legal_documents_;
 
   // True after the user first accepts the dialog and presses "Submit". May
   // continue to be true while processing required actions.
   bool is_submitting_;
 
+  // A helper to validate international address input.
+  scoped_ptr< ::i18n::addressinput::AddressValidator> validator_;

[Evan Stade, 2014/02/01 00:56:31]

why is this here in the middle of various state bools?

[Dan Beam, 2014/02/01 01:14:54]

Done.

+
   // True if the last call to |GetFullWallet()| returned a
   // CHOOSE_ANOTHER_INSTRUMENT_OR_ADDRESS required action, indicating that the
   // selected instrument or address had become invalid since it was originally
   // returned in |GetWalletItems()|.
   bool choose_another_instrument_or_address_;
 
   // Whether or not the server side validation errors returned by Wallet were
   // recoverable.
   bool wallet_server_validation_recoverable_;
 
@@ skipping 44 matching lines @@
   base::OneShotTimer<AutofillDialogControllerImpl> card_scrambling_delay_;
   base::RepeatingTimer<AutofillDialogControllerImpl> card_scrambling_refresher_;
 
   // 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_;
+
   DISALLOW_COPY_AND_ASSIGN(AutofillDialogControllerImpl);
 };
 
 }  // namespace autofill
 
 #endif  // CHROME_BROWSER_UI_AUTOFILL_AUTOFILL_DIALOG_CONTROLLER_IMPL_H_