Use upstream libaddressinput in Chrome.

chrome/browser/ui/autofill/autofill_dialog_controller_impl.cc

 // Copyright 2013 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 "chrome/browser/ui/autofill/autofill_dialog_controller_impl.h"
 
 #include <algorithm>
 #include <map>
 #include <string>
 
 #include "apps/app_window.h"
 #include "apps/app_window_registry.h"
 #include "apps/ui/native_app_window.h"
 #include "base/base64.h"
+#include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/i18n/case_conversion.h"
 #include "base/i18n/rtl.h"
 #include "base/logging.h"
 #include "base/prefs/pref_registry_simple.h"
 #include "base/prefs/pref_service.h"
 #include "base/prefs/scoped_user_pref_update.h"
 #include "base/rand_util.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 47 matching lines @@
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/url_constants.h"
 #include "grit/chromium_strings.h"
 #include "grit/component_scaled_resources.h"
 #include "grit/components_strings.h"
 #include "grit/generated_resources.h"
-#include "grit/libaddressinput_strings.h"
+#include "grit/libaddressinput/messages.h"
 #include "grit/platform_locale_settings.h"
 #include "grit/theme_resources.h"
 #include "net/cert/cert_status_flags.h"
 #include "third_party/libaddressinput/chromium/chrome_downloader_impl.h"
 #include "third_party/libaddressinput/chromium/chrome_storage_impl.h"
-#include "third_party/libaddressinput/chromium/cpp/include/libaddressinput/address_data.h"
-#include "third_party/libaddressinput/chromium/cpp/include/libaddressinput/address_problem.h"
+#include "third_party/libaddressinput/chromium/preload_address_validator.h"
+#include "third_party/libaddressinput/src/cpp/include/libaddressinput/address_data.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 "third_party/libaddressinput/src/cpp/include/libaddressinput/callback.h"
+#include "third_party/libaddressinput/src/cpp/include/libaddressinput/localization.h"
 #include "ui/base/base_window.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/models/combobox_model.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/image/image_skia_operations.h"
 #include "ui/gfx/skia_util.h"
 
 using ::i18n::addressinput::AddressData;
 using ::i18n::addressinput::AddressField;
 using ::i18n::addressinput::AddressProblem;
-using ::i18n::addressinput::AddressProblemFilter;
-using ::i18n::addressinput::AddressProblems;
-using ::i18n::addressinput::AddressValidator;
+using ::i18n::addressinput::FieldProblemMap;
 
 namespace autofill {
 
 namespace {
 
 const char kAddNewItemKey[] = "add-new-item";
 const char kManageItemsKey[] = "manage-items";
 const char kSameAsBillingKey[] = "same-as-billing";
 
 // URLs for Wallet error messages.
@@ skipping 393 matching lines @@
   return rb.GetImageNamed(IDR_CREDIT_CARD_CVC_HINT);
 }
 
 ServerFieldType CountryTypeForSection(DialogSection section) {
   return section == SECTION_SHIPPING ? ADDRESS_HOME_COUNTRY :
                                        ADDRESS_BILLING_COUNTRY;
 }
 
 // Attempts to canonicalize the administrative area name in |profile| using the
 // rules in |validator|.
-void CanonicalizeState(const AddressValidator* validator,
+void CanonicalizeState(const PreloadAddressValidator* validator,
                        AutofillProfile* profile) {
   base::string16 administrative_area;
   scoped_ptr<AddressData> address_data =
       i18n::CreateAddressDataFromAutofillProfile(
           *profile, g_browser_process->GetApplicationLocale());
 
   validator->CanonicalizeAdministrativeArea(address_data.get());
   administrative_area = base::UTF8ToUTF16(address_data->administrative_area);
 
   profile->SetInfo(AutofillType(ADDRESS_HOME_STATE),
@@ skipping 289 matching lines @@
 
   acceptable_cc_types_ = form_structure_.PossibleValues(CREDIT_CARD_TYPE);
   // Wallet generates MC virtual cards, so we have to disable it if MC is not
   // allowed.
   if (ShouldDisallowCcType(CreditCard::TypeForDisplay(kMasterCard)))
     DisableWallet(wallet::WalletClient::UNSUPPORTED_MERCHANT);
 
   if (account_chooser_model_->WalletIsSelected())
     FetchWalletCookie();
 
-  scoped_ptr< ::i18n::addressinput::Downloader> downloader(
-      new autofill::ChromeDownloaderImpl(profile_->GetRequestContext()));
-  validator_ = AddressValidator::Build(
-      downloader.Pass(),
-      ValidationRulesStorageFactory::CreateStorage(),
-      this);
+  validator_.reset(new PreloadAddressValidator(
+      I18N_ADDRESS_VALIDATION_DATA_URL,
+      scoped_ptr< ::i18n::addressinput::Downloader>(
+          new autofill::ChromeDownloaderImpl(profile_->GetRequestContext())),
+      ValidationRulesStorageFactory::CreateStorage()));
 
   SuggestionsUpdated();
   SubmitButtonDelayBegin();
   view_.reset(CreateView());
   view_->Show();
   GetManager()->AddObserver(this);
 
   if (!account_chooser_model_->WalletIsSelected())
     LogDialogLatencyToShow();
 }
@@ skipping 453 matching lines @@
   }
 
   DetailInputs* inputs = MutableRequestedFieldsForSection(section);
   for (DetailInputs::iterator it = inputs->begin();
        it != inputs->end(); ++it) {
     if (it->length != DetailInput::NONE) {
       it->initial_value.clear();
     } else if (!it->initial_value.empty() &&
                (it->type == ADDRESS_BILLING_COUNTRY ||
                 it->type == ADDRESS_HOME_COUNTRY)) {
-      GetValidator()->LoadRules(AutofillCountry::GetCountryCode(
-          it->initial_value, g_browser_process->GetApplicationLocale()));
+      GetValidator()->LoadRules(
+          AutofillCountry::GetCountryCode(
+              it->initial_value, g_browser_process->GetApplicationLocale()),
+          *address_validation_rules_loaded_);
     }
   }
 }
 
 void AutofillDialogControllerImpl::ShowEditUiIfBadSuggestion(
     DialogSection section) {
   // |CreateWrapper()| returns an empty wrapper if |IsEditingExistingData()|, so
   // get the wrapper before this potentially happens below.
   scoped_ptr<DataModelWrapper> wrapper = CreateWrapper(section);
 
@@ skipping 576 matching lines @@
         base::string16 message = CreditCardNumberValidityMessage(value);
         if (!message.empty())
           return message;
       }
       break;
     }
 
     case CREDIT_CARD_EXP_MONTH:
       if (!InputWasEdited(CREDIT_CARD_EXP_MONTH, value)) {
         return l10n_util::GetStringUTF16(
-            IDS_LIBADDRESSINPUT_I18N_MISSING_REQUIRED_FIELD);
+            IDS_LIBADDRESSINPUT_MISSING_REQUIRED_FIELD);
       }
       break;
 
     case CREDIT_CARD_EXP_4_DIGIT_YEAR:
       if (!InputWasEdited(CREDIT_CARD_EXP_4_DIGIT_YEAR, value)) {
         return l10n_util::GetStringUTF16(
-            IDS_LIBADDRESSINPUT_I18N_MISSING_REQUIRED_FIELD);
+            IDS_LIBADDRESSINPUT_MISSING_REQUIRED_FIELD);
       }
       break;
 
     case CREDIT_CARD_VERIFICATION_CODE:
       if (!value.empty() && !autofill::IsValidCreditCardSecurityCode(value)) {
         return l10n_util::GetStringUTF16(
             IDS_AUTOFILL_DIALOG_VALIDATION_INVALID_CREDIT_CARD_SECURITY_CODE);
       }
       break;
 
@@ skipping 10 matching lines @@
       break;
 
     case PHONE_BILLING_WHOLE_NUMBER:  // Used in billing section.
       break;
 
     default:
       NOTREACHED();  // Trying to validate unknown field.
       break;
   }
 
-  return value.empty() ? l10n_util::GetStringUTF16(
-                             IDS_LIBADDRESSINPUT_I18N_MISSING_REQUIRED_FIELD) :
-                         base::string16();
+  return value.empty() ?
+      l10n_util::GetStringUTF16(IDS_LIBADDRESSINPUT_MISSING_REQUIRED_FIELD) :
+      base::string16();
 }
 
 // TODO(groby): Also add tests.
 ValidityMessages AutofillDialogControllerImpl::InputsAreValid(
     DialogSection section,
     const FieldValueMap& inputs) {
   ValidityMessages messages;
   if (inputs.empty())
     return messages;
 
-  AddressValidator::Status status = AddressValidator::SUCCESS;
+  PreloadAddressValidator::Status status = PreloadAddressValidator::SUCCESS;
   if (section != SECTION_CC) {
     AutofillProfile profile;
     FillFormGroupFromOutputs(inputs, &profile);
     scoped_ptr<AddressData> address_data =
         i18n::CreateAddressDataFromAutofillProfile(
             profile, g_browser_process->GetApplicationLocale());
     address_data->language_code = AddressLanguageCodeForSection(section);
 
-    AddressProblems problems;
-    status = GetValidator()->ValidateAddress(*address_data,
-                                             AddressProblemFilter(),
-                                             &problems);
+    ::i18n::addressinput::Localization localization;
+    localization.SetGetter(
+        l10n_util::GetStringUTF8, g_browser_process->GetApplicationLocale());
+
+    FieldProblemMap problems;
+    status = GetValidator()->Validate(*address_data, NULL, &problems);
     common::AddressType address_type = section == SECTION_SHIPPING ?
         common::ADDRESS_TYPE_SHIPPING : common::ADDRESS_TYPE_BILLING;
-    for (size_t i = 0; i < problems.size(); ++i) {
-      const AddressProblem& problem = problems[i];
-      bool sure = problem.type != AddressProblem::MISSING_REQUIRED_FIELD;
-      base::string16 text = l10n_util::GetStringUTF16(problem.description_id);
-      messages.Set(i18ninput::TypeForField(problem.field, address_type),
+    for (FieldProblemMap::const_iterator iter = problems.begin();
+         iter != problems.end(); ++iter) {
+      bool sure = iter->second != ::i18n::addressinput::MISSING_REQUIRED_FIELD;
+      base::string16 text = base::UTF8ToUTF16(
+          localization.GetErrorMessage(*address_data,
+                                       iter->first,
+                                       iter->second,
+                                       /*enable_examples*/ true,
+                                       /*enable_links*/ false));
+      messages.Set(i18ninput::TypeForField(iter->first, address_type),
                    ValidityMessage(text, sure));
     }
   }
 
   for (FieldValueMap::const_iterator iter = inputs.begin();
        iter != inputs.end(); ++iter) {
     const ServerFieldType type = iter->first;
     base::string16 text = InputValidityMessage(section, type, iter->second);
 
     // Skip empty/unchanged fields in edit mode. If the individual field does
     // not have validation errors, assume it to be valid unless later proven
     // otherwise.
     bool sure = InputWasEdited(type, iter->second);
 
-    if (sure && status == AddressValidator::RULES_NOT_READY &&
+    if (sure && status == PreloadAddressValidator::RULES_NOT_READY &&
         !ComboboxModelForAutofillType(type) &&
         (AutofillType(type).group() == ADDRESS_HOME ||
          AutofillType(type).group() == ADDRESS_BILLING)) {
       DCHECK(text.empty());
       text = l10n_util::GetStringUTF16(
           IDS_AUTOFILL_DIALOG_VALIDATION_WAITING_FOR_RULES);
       sure = false;
       needs_validation_.insert(section);
     }
 
@@ skipping 785 matching lines @@
       cares_about_shipping_(true),
       popup_input_type_(UNKNOWN_TYPE),
       waiting_for_explicit_sign_in_response_(false),
       has_accepted_legal_documents_(false),
       is_submitting_(false),
       choose_another_instrument_or_address_(false),
       wallet_server_validation_recoverable_(true),
       data_was_passed_back_(false),
       was_ui_latency_logged_(false),
       card_generated_animation_(2000, 60, this),
-      weak_ptr_factory_(this) {
+      weak_ptr_factory_(this),
+      address_validation_rules_loaded_(
+          ::i18n::addressinput::BuildCallback(
+              this,
+              &AutofillDialogControllerImpl::AddressValidationRulesLoaded)) {
   DCHECK(!callback_.is_null());
 }
 
 AutofillDialogView* AutofillDialogControllerImpl::CreateView() {
   return AutofillDialogView::Create(this);
 }
 
 PersonalDataManager* AutofillDialogControllerImpl::GetManager() const {
   return PersonalDataManagerFactory::GetForProfile(profile_);
 }
 
-AddressValidator* AutofillDialogControllerImpl::GetValidator() {
+PreloadAddressValidator* AutofillDialogControllerImpl::GetValidator() {
   return validator_.get();
 }
 
 const wallet::WalletClient* AutofillDialogControllerImpl::GetWalletClient()
     const {
   return const_cast<AutofillDialogControllerImpl*>(this)->GetWalletClient();
 }
 
 wallet::WalletClient* AutofillDialogControllerImpl::GetWalletClient() {
   return &wallet_client_;
@@ skipping 534 matching lines @@
 
   AutofillProfile profile;
   FillFormGroupFromOutputs(inputs, &profile);
 
   scoped_ptr<AddressData> user_input =
       i18n::CreateAddressDataFromAutofillProfile(
           profile, g_browser_process->GetApplicationLocale());
   user_input->language_code = AddressLanguageCodeForSection(section);
 
   static const size_t kSuggestionsLimit = 10;
-  AddressValidator::Status status = GetValidator()->GetSuggestions(
+  PreloadAddressValidator::Status status = GetValidator()->GetSuggestions(
       *user_input, focused_field, kSuggestionsLimit,
       &i18n_validator_suggestions_);
 
-  if (status != AddressValidator::SUCCESS)
+  if (status != PreloadAddressValidator::SUCCESS)
     return;
 
   for (size_t i = 0; i < i18n_validator_suggestions_.size(); ++i) {
     popup_values->push_back(base::UTF8ToUTF16(
         i18n_validator_suggestions_[i].GetFieldValue(focused_field)));
 
     // Disambiguate the suggestion by showing the smallest administrative
     // region of the suggested address:
     //    ADMIN_AREA > LOCALITY > DEPENDENT_LOCALITY
     popup_labels->push_back(base::string16());
@@ skipping 80 matching lines @@
     if (outputs[CountryTypeForSection(section)] == country_name)
       return false;
   }
 
   DetailInputs* inputs = MutableRequestedFieldsForSection(section);
   inputs->clear();
   BuildInputsForSection(section, country_code, inputs,
                         MutableAddressLanguageCodeForSection(section));
 
   if (!country_code.empty()) {
-    GetValidator()->LoadRules(AutofillCountry::GetCountryCode(
-        country_name, g_browser_process->GetApplicationLocale()));
+    GetValidator()->LoadRules(
+        AutofillCountry::GetCountryCode(
+            country_name, g_browser_process->GetApplicationLocale()),
+        *address_validation_rules_loaded_);
   }
 
   return true;
 }
 
 void AutofillDialogControllerImpl::HidePopup() {
   if (popup_controller_)
     popup_controller_->Hide();
   popup_input_type_ = UNKNOWN_TYPE;
 }
@@ skipping 61 matching lines @@
   if (!IsManuallyEditingSection(section))
     return true;
 
   FieldValueMap detail_outputs;
   view_->GetUserInput(section, &detail_outputs);
   return !InputsAreValid(section, detail_outputs).HasSureErrors();
 }
 
 bool AutofillDialogControllerImpl::RulesAreLoaded(DialogSection section) {
   AddressData address_data;
-  address_data.country_code = CountryCodeForSection(section);
-  AddressValidator::Status status = GetValidator()->ValidateAddress(
-      address_data, AddressProblemFilter(), NULL);
-  return status == AddressValidator::SUCCESS;
+  address_data.region_code = CountryCodeForSection(section);
+  FieldProblemMap dummy;
+  PreloadAddressValidator::Status status = GetValidator()->Validate(
+      address_data, NULL, &dummy);
+  return status == PreloadAddressValidator::SUCCESS;
 }
 
 bool AutofillDialogControllerImpl::IsCreditCardExpirationValid(
     const base::string16& year,
     const base::string16& month) const {
   // If the expiration is in the past as per the local clock, it's invalid.
   base::Time now = base::Time::Now();
   if (!autofill::IsValidCreditCardExpirationDate(year, month, now))
     return false;
 
@@ skipping 30 matching lines @@
 
   return false;
 }
 
 bool AutofillDialogControllerImpl::HasInvalidAddress(
     const AutofillProfile& profile) {
   scoped_ptr<AddressData> address_data =
       i18n::CreateAddressDataFromAutofillProfile(
           profile, g_browser_process->GetApplicationLocale());
 
-  AddressProblems problems;
-  GetValidator()->ValidateAddress(*address_data,
-                                  AddressProblemFilter(),
-                                  &problems);
+  FieldProblemMap problems;
+  GetValidator()->Validate(*address_data, NULL, &problems);
   return !problems.empty();
 }
 
 bool AutofillDialogControllerImpl::ShouldUseBillingForShipping() {
   return SectionIsActive(SECTION_SHIPPING) &&
       suggested_shipping_.GetItemKeyForCheckedItem() == kSameAsBillingKey;
 }
 
 bool AutofillDialogControllerImpl::ShouldSaveDetailsLocally() {
   // It's possible that the user checked [X] Save details locally before
@@ skipping 182 matching lines @@
   DCHECK_EQ(animation, &card_generated_animation_);
   PushOverlayUpdate();
 }
 
 void AutofillDialogControllerImpl::AnimationEnded(
     const gfx::Animation* animation) {
   DCHECK_EQ(animation, &card_generated_animation_);
   DoFinishSubmit();
 }
 
-void AutofillDialogControllerImpl::OnAddressValidationRulesLoaded(
+void AutofillDialogControllerImpl::AddressValidationRulesLoaded(
+    bool success,
     const std::string& country_code,
-    bool success) {
+    const int& /*rule_count*/) {
   // Rules may load instantly (during initialization, before the view is
   // even ready). We'll validate when the view is created.
   if (!view_)
     return;
 
   ScopedViewUpdates updates(view_.get());
 
   // TODO(dbeam): should we retry on failure?
   for (size_t i = SECTION_MIN; i <= SECTION_MAX; ++i) {
     DialogSection section = static_cast<DialogSection>(i);
@@ skipping 273 matching lines @@
   view_->UpdateButtonStrip();
 }
 
 void AutofillDialogControllerImpl::FetchWalletCookie() {
   net::URLRequestContextGetter* request_context = profile_->GetRequestContext();
   signin_helper_.reset(new wallet::WalletSigninHelper(this, request_context));
   signin_helper_->StartWalletCookieValueFetch();
 }
 
 }  // namespace autofill