Use upstream libaddressinput in Chrome.

chrome/browser/ui/autofill/autofill_dialog_controller_unittest.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 <map>
+#include <utility>
 
+#include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/guid.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/prefs/pref_service.h"
 #include "base/run_loop.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 30 matching lines @@
 #include "components/autofill/core/common/autofill_switches.h"
 #include "components/autofill/core/common/form_data.h"
 #include "components/user_prefs/user_prefs.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/test/mock_render_process_host.h"
 #include "google_apis/gaia/google_service_auth_error.h"
 #include "grit/component_scaled_resources.h"
 #include "grit/generated_resources.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.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_field.h"
+#include "third_party/libaddressinput/src/cpp/include/libaddressinput/address_problem.h"
+#include "third_party/libaddressinput/src/cpp/include/libaddressinput/address_validator.h"
 #include "ui/base/resource/resource_bundle.h"
 
 #if defined(OS_WIN)
 #include "ui/base/win/scoped_ole_initializer.h"
 #endif
 
 using base::ASCIIToUTF16;
 using base::UTF8ToUTF16;
 
 namespace autofill {
 
 namespace {
 
-using ::i18n::addressinput::AddressData;
-using ::i18n::addressinput::AddressProblemFilter;
-using ::i18n::addressinput::AddressProblem;
-using ::i18n::addressinput::AddressProblems;
-using ::i18n::addressinput::AddressValidator;
+using ::i18n::addressinput::FieldProblemMap;
 using testing::AtLeast;
 using testing::DoAll;
 using testing::Return;
 using testing::SetArgPointee;
 using testing::_;
 
 const char kSourceUrl[] = "http://localbike.shop";
 const char kFakeEmail[] = "user@chromium.org";
 const char kFakeFingerprintEncoded[] = "CgVaAwiACA==";
 const char kEditedBillingAddress[] = "123 edited billing address";
@@ skipping 249 matching lines @@
   using AutofillDialogControllerImpl::NOT_CHECKED;
   using AutofillDialogControllerImpl::popup_input_type;
   using AutofillDialogControllerImpl::SignedInState;
 
  protected:
   virtual PersonalDataManager* GetManager() const OVERRIDE {
     return const_cast<TestAutofillDialogController*>(this)->
         GetTestingManager();
   }
 
-  virtual AddressValidator* GetValidator() OVERRIDE {
+  virtual PreloadAddressValidator* GetValidator() OVERRIDE {
     return &mock_validator_;
   }
 
   virtual wallet::WalletClient* GetWalletClient() OVERRIDE {
     return &mock_wallet_client_;
   }
 
   virtual void OpenTabWithUrl(const GURL& url) OVERRIDE {
     open_tab_url_ = url;
   }
@@ skipping 644 matching lines @@
 
   AutofillProfile verified_profile(test::GetVerifiedProfile());
   controller()->GetTestingManager()->AddTestingProfile(&verified_profile);
   EXPECT_EQ(4, shipping_model->GetItemCount());
   EXPECT_FALSE(controller()->IsManuallyEditingSection(SECTION_SHIPPING));
   EXPECT_FALSE(controller()->IsManuallyEditingSection(SECTION_BILLING));
 
   // Now make up a problem and make sure the profile isn't in the list.
   Reset();
   SwitchToAutofill();
-  AddressProblems problems;
-  problems.push_back(
-      AddressProblem(::i18n::addressinput::POSTAL_CODE,
-                     AddressProblem::MISMATCHING_VALUE,
-                     IDS_LEARN_MORE));
+  FieldProblemMap problems;
+  problems.insert(std::make_pair(::i18n::addressinput::POSTAL_CODE,
+                                 ::i18n::addressinput::MISMATCHING_VALUE));
   EXPECT_CALL(*controller()->GetMockValidator(),
-              ValidateAddress(CountryCodeMatcher("US"), _, _)).
+              Validate(CountryCodeMatcher("US"), _, _)).
       WillRepeatedly(DoAll(SetArgPointee<2>(problems),
-                           Return(AddressValidator::SUCCESS)));
+                           Return(PreloadAddressValidator::SUCCESS)));
 
   controller()->GetTestingManager()->AddTestingProfile(&verified_profile);
   shipping_model = GetMenuModelForSection(SECTION_SHIPPING);
   EXPECT_EQ(4, shipping_model->GetItemCount());
   EXPECT_TRUE(controller()->IsManuallyEditingSection(SECTION_SHIPPING));
   EXPECT_TRUE(controller()->IsManuallyEditingSection(SECTION_BILLING));
 }
 
 // Makes sure suggestion profiles are re-validated when validation rules load.
 TEST_F(AutofillDialogControllerTest, AutofillProfilesRevalidateAfterRulesLoad) {
   SwitchToAutofill();
   SuggestionsMenuModel* shipping_model =
       GetMenuModelForSection(SECTION_SHIPPING);
   EXPECT_EQ(3, shipping_model->GetItemCount());
   // "Same as billing" is selected.
   EXPECT_FALSE(controller()->IsManuallyEditingSection(SECTION_SHIPPING));
   EXPECT_TRUE(controller()->IsManuallyEditingSection(SECTION_BILLING));
   AutofillProfile verified_profile(test::GetVerifiedProfile());
   controller()->GetTestingManager()->AddTestingProfile(&verified_profile);
   EXPECT_EQ(4, shipping_model->GetItemCount());
   EXPECT_FALSE(controller()->IsManuallyEditingSection(SECTION_SHIPPING));
   EXPECT_FALSE(controller()->IsManuallyEditingSection(SECTION_BILLING));
 
-  AddressProblems problems;
-  problems.push_back(
-      AddressProblem(::i18n::addressinput::POSTAL_CODE,
-                     AddressProblem::MISMATCHING_VALUE,
-                     IDS_LEARN_MORE));
+  FieldProblemMap problems;
+  problems.insert(std::make_pair(::i18n::addressinput::POSTAL_CODE,
+                                 ::i18n::addressinput::MISMATCHING_VALUE));
   EXPECT_CALL(*controller()->GetMockValidator(),
-              ValidateAddress(CountryCodeMatcher("US"), _, _)).
+              Validate(CountryCodeMatcher("US"), _, _)).
       WillRepeatedly(DoAll(SetArgPointee<2>(problems),
-                           Return(AddressValidator::SUCCESS)));
+                           Return(PreloadAddressValidator::SUCCESS)));
 
-  controller()->OnAddressValidationRulesLoaded("US", true);
+  controller()->AddressValidationRulesLoaded(true, "US", 0);
   EXPECT_EQ(4, shipping_model->GetItemCount());
   EXPECT_TRUE(controller()->IsManuallyEditingSection(SECTION_SHIPPING));
   EXPECT_TRUE(controller()->IsManuallyEditingSection(SECTION_BILLING));
 }
 
 // Makes sure that the choice of which Autofill profile to use for each section
 // is sticky.
 TEST_F(AutofillDialogControllerTest, AutofillProfileDefaults) {
   SwitchToAutofill();
   AutofillProfile profile(test::GetVerifiedProfile());
@@ skipping 2137 matching lines @@
                                            gfx::Rect(),
                                            ASCIIToUTF16("Italy"),
                                            true);
   updates = view->section_updates();
   EXPECT_EQ(1U, updates[SECTION_BILLING]);
   EXPECT_EQ(1U, updates.size());
 }
 
 TEST_F(AutofillDialogControllerTest, CorrectCountryFromInputs) {
   EXPECT_CALL(*controller()->GetMockValidator(),
-              ValidateAddress(CountryCodeMatcher("DE"), _, _));
+              Validate(CountryCodeMatcher("DE"), _, _));
 
   FieldValueMap billing_inputs;
   billing_inputs[ADDRESS_BILLING_COUNTRY] = ASCIIToUTF16("Germany");
   controller()->InputsAreValid(SECTION_BILLING, billing_inputs);
 
   EXPECT_CALL(*controller()->GetMockValidator(),
-              ValidateAddress(CountryCodeMatcher("FR"), _, _));
+              Validate(CountryCodeMatcher("FR"), _, _));
 
   FieldValueMap shipping_inputs;
   shipping_inputs[ADDRESS_HOME_COUNTRY] = ASCIIToUTF16("France");
   controller()->InputsAreValid(SECTION_SHIPPING, shipping_inputs);
 }
 
 TEST_F(AutofillDialogControllerTest, ValidationRulesLoadedOnCountryChange) {
   ResetControllerWithFormData(DefaultFormData());
   EXPECT_CALL(*controller()->GetMockValidator(),
-              LoadRules("US")).Times(AtLeast(1));
+              LoadRules("US", _)).Times(AtLeast(1));

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

To reduce reviewer burden: Make LoadRules() not take a callback but instead call
LoadRulesDelegate when finished.

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

Done.

   controller()->Show();
 
-  EXPECT_CALL(*controller()->GetMockValidator(), LoadRules("FR"));
+  EXPECT_CALL(*controller()->GetMockValidator(), LoadRules("FR", _));
   controller()->UserEditedOrActivatedInput(SECTION_BILLING,
                                            ADDRESS_BILLING_COUNTRY,
                                            gfx::NativeView(),
                                            gfx::Rect(),
                                            ASCIIToUTF16("France"),
                                            true);
 }
 
 TEST_F(AutofillDialogControllerTest, UsValidationRulesLoadedForJpOnlyProfile) {
   ResetControllerWithFormData(DefaultFormData());
   AutofillProfile jp_profile(base::GenerateGUID(), kSettingsOrigin);
   jp_profile.SetRawInfo(ADDRESS_HOME_COUNTRY, ASCIIToUTF16("JP"));
   controller()->GetTestingManager()->AddTestingProfile(&jp_profile);
-  EXPECT_CALL(*controller()->GetMockValidator(), LoadRules("US"));
+  EXPECT_CALL(*controller()->GetMockValidator(), LoadRules("US", _));
   EXPECT_CALL(*controller()->GetMockValidator(),
-              LoadRules("JP")).Times(AtLeast(1));
+              LoadRules("JP", _)).Times(AtLeast(1));
   controller()->Show();
 }
 
 TEST_F(AutofillDialogControllerTest, InvalidWhenRulesNotReady) {
   // Select "Add new shipping address...".
   controller()->MenuModelForSection(SECTION_SHIPPING)->ActivatedAt(1);
 
   // If the rules haven't loaded yet, validation errors should show on submit.
   EXPECT_CALL(*controller()->GetMockValidator(),
-              ValidateAddress(CountryCodeMatcher("US"), _, _)).
-              WillRepeatedly(Return(AddressValidator::RULES_NOT_READY));
+              Validate(CountryCodeMatcher("US"), _, _)).
+              WillRepeatedly(Return(PreloadAddressValidator::RULES_NOT_READY));
 
   FieldValueMap inputs;
   inputs[ADDRESS_HOME_ZIP] = ASCIIToUTF16("1234");
   inputs[ADDRESS_HOME_COUNTRY] = ASCIIToUTF16("United States");
 
   ValidityMessages messages =
       controller()->InputsAreValid(SECTION_SHIPPING, inputs);
   EXPECT_FALSE(messages.GetMessageOrDefault(ADDRESS_HOME_ZIP).text.empty());
   EXPECT_FALSE(messages.HasSureError(ADDRESS_HOME_ZIP));
   // Country should never show an error message as it's always valid.
   EXPECT_TRUE(messages.GetMessageOrDefault(ADDRESS_HOME_COUNTRY).text.empty());
 }
 
 TEST_F(AutofillDialogControllerTest, ValidButUnverifiedWhenRulesFail) {
   SwitchToAutofill();
 
   // Add suggestions so the credit card and billing sections aren't showing
   // their manual inputs (to isolate to just shipping).
   AutofillProfile verified_profile(test::GetVerifiedProfile());
   controller()->GetTestingManager()->AddTestingProfile(&verified_profile);
   CreditCard verified_card(test::GetVerifiedCreditCard());
   controller()->GetTestingManager()->AddTestingCreditCard(&verified_card);
 
   // Select "Add new shipping address...".
   controller()->MenuModelForSection(SECTION_SHIPPING)->ActivatedAt(2);
 
   // If the rules are unavailable, validation errors should not show.
   EXPECT_CALL(*controller()->GetMockValidator(),
-              ValidateAddress(CountryCodeMatcher("US"), _, _)).
-              WillRepeatedly(Return(AddressValidator::RULES_UNAVAILABLE));
+              Validate(CountryCodeMatcher("US"), _, _))
+      .WillRepeatedly(Return(PreloadAddressValidator::RULES_UNAVAILABLE));
 
   FieldValueMap outputs;
   AutofillProfile full_profile(test::GetFullProfile());
   const DetailInputs& inputs =
       controller()->RequestedFieldsForSection(SECTION_SHIPPING);
   for (size_t i = 0; i < inputs.size(); ++i) {
     const ServerFieldType type = inputs[i].type;
     outputs[type] = full_profile.GetInfo(AutofillType(type), "en-US");
   }
   controller()->GetView()->SetUserInput(SECTION_SHIPPING, outputs);
@@ skipping 229 matching lines @@
   controller()->MenuModelForSection(SECTION_CC_BILLING)->ActivatedAt(2);
 
   FieldValueMap outputs;
   outputs[NAME_FULL] = ASCIIToUTF16("madonna");
   controller()->GetView()->SetUserInput(SECTION_CC_BILLING, outputs);
 
   ASSERT_NO_FATAL_FAILURE(SwitchToAutofill());
 }
 
 }  // namespace autofill