Use upstream libaddressinput in Chrome.

chrome/browser/ui/autofill/autofill_dialog_controller_browsertest.cc

 // 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.
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 63 matching lines @@
 #endif
 
 using base::ASCIIToUTF16;
 
 namespace autofill {
 
 namespace {
 
 using testing::Return;
 using testing::_;
-using ::i18n::addressinput::AddressValidator;
 
 void MockCallback(AutofillManagerDelegate::RequestAutocompleteResult,
                   const base::string16& message,
                   const FormStructure*) {}
 
 class MockAutofillMetrics : public AutofillMetrics {
  public:
   MockAutofillMetrics()
       : dialog_dismissal_action_(static_cast<DialogDismissalAction>(-1)) {}
   virtual ~MockAutofillMetrics() {}
@@ skipping 128 matching lines @@
 
   void set_sign_in_user_index(size_t sign_in_user_index) {
     sign_in_user_index_ = sign_in_user_index;
   }
 
  protected:
   virtual PersonalDataManager* GetManager() const OVERRIDE {
     return &const_cast<TestAutofillDialogController*>(this)->test_manager_;
   }
 
-  virtual AddressValidator* GetValidator() OVERRIDE {
+  virtual PreloadAddressValidator* GetValidator() OVERRIDE {
     return &mock_validator_;
   }
 
   virtual wallet::WalletClient* GetWalletClient() OVERRIDE {
     return &mock_wallet_client_;
   }
 
   virtual bool IsSignInContinueUrl(const GURL& url, size_t* user_index) const
       OVERRIDE {
     *user_index = sign_in_user_index_;
@@ skipping 1464 matching lines @@
   EXPECT_EQ(ASCIIToUTF16("Belarus"),
             view->GetTextContentsOfInput(ADDRESS_HOME_COUNTRY));
 }
 
 IN_PROC_BROWSER_TEST_F(AutofillDialogControllerTest, RulesLoaded) {
   // Select "Add new shipping address...".
   controller()->MenuModelForSection(SECTION_SHIPPING)->ActivatedAt(1);
   controller()->set_use_validation(true);
 
   EXPECT_CALL(*controller()->GetMockValidator(),
-              ValidateAddress(CountryCodeMatcher("DE"), _, _)).Times(2).
-              WillOnce(Return(AddressValidator::RULES_NOT_READY));
+              Validate(CountryCodeMatcher("DE"), _, _)).Times(2).

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

To reduce reviewer burden: change Validate() back to ValidateAddress().

[please use gerrit instead, 2014/06/09 23:28:16]

Done.

+              WillOnce(Return(PreloadAddressValidator::RULES_NOT_READY));
 
   // Validation should occur on country change and see the rules haven't loaded.
   scoped_ptr<AutofillDialogViewTester> view = GetViewTester();
   view->SetTextContentsOfInput(ADDRESS_HOME_ZIP, ASCIIToUTF16("123"));
   view->SetTextContentsOfInput(ADDRESS_HOME_COUNTRY, ASCIIToUTF16("Germany"));
   view->ActivateInput(ADDRESS_HOME_COUNTRY);
 
   // Different country loaded, validation should not occur.
-  controller()->OnAddressValidationRulesLoaded("FR", true);
+  controller()->AddressValidationRulesLoaded(true, "FR", 0);

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

To reduce reviewer burden: AddressValidationRulesLoaded(bool, string, int) back
to OnAddressValidationRulesLoaded(string, bool).

 
   // Relevant country loaded, validation should occur.
-  controller()->OnAddressValidationRulesLoaded("DE", true);
+  controller()->AddressValidationRulesLoaded(true, "DE", 0);
 
   // Relevant country loaded but revalidation already happened, no further
   // validation should occur.
-  controller()->OnAddressValidationRulesLoaded("DE", false);
+  controller()->AddressValidationRulesLoaded(false, "DE", 0);
 
   // Cancelling the dialog causes additional validation to see if the user
   // cancelled with invalid fields, so verify and clear here.
   testing::Mock::VerifyAndClearExpectations(controller()->GetMockValidator());
 }
 
 }  // namespace autofill