rAc: use libaddressinput to validate international addresses.

chrome/browser/ui/autofill/autofill_dialog_controller_impl.cc

Index: chrome/browser/ui/autofill/autofill_dialog_controller_impl.cc
diff --git a/chrome/browser/ui/autofill/autofill_dialog_controller_impl.cc b/chrome/browser/ui/autofill/autofill_dialog_controller_impl.cc
index 03c9f9f0b371e70c02d4cdb5083ddc95ba0bcea2..117bc809f8f2cf18b59f57b5a141bc3f1458cc7e 100644
--- a/chrome/browser/ui/autofill/autofill_dialog_controller_impl.cc
+++ b/chrome/browser/ui/autofill/autofill_dialog_controller_impl.cc
@@ -26,12 +26,14 @@
 #include "base/strings/utf_string_conversions.h"
 #include "base/time/time.h"
 #include "chrome/browser/autofill/personal_data_manager_factory.h"
+#include "chrome/browser/autofill/validation_rules_storage_factory.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/autofill/autofill_dialog_common.h"
 #include "chrome/browser/ui/autofill/autofill_dialog_i18n_input.h"
 #include "chrome/browser/ui/autofill/autofill_dialog_view.h"
 #include "chrome/browser/ui/autofill/data_model_wrapper.h"
+#include "chrome/browser/ui/autofill/field_map_wrapper.h"
 #include "chrome/browser/ui/autofill/generated_credit_card_bubble_controller.h"
 #include "chrome/browser/ui/autofill/new_credit_card_bubble_controller.h"
 #include "chrome/browser/ui/browser.h"
@@ -79,6 +81,10 @@
 #include "grit/theme_resources.h"
 #include "grit/webkit_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 "ui/base/base_window.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/models/combobox_model.h"
@@ -88,6 +94,13 @@
 #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;
+
 namespace autofill {
 
 namespace {
@@ -618,6 +631,16 @@ void AutofillDialogControllerImpl::Show() {
   if (account_chooser_model_->WalletIsSelected())
     FetchWalletCookie();
 
+  if (i18ninput::Enabled()) {
+    scoped_ptr< ::i18n::addressinput::Downloader> downloader(
+        new autofill::ChromeDownloaderImpl(profile_->GetRequestContext()));
+    validator_ = AddressValidator::Build(
+        downloader.Pass(),
+        ValidationRulesStorageFactory::CreateStorage(),
+        this);
+    validator_->LoadRules(GetManager()->GetDefaultCountryCodeForNewAddress());
+  }
+
   // TODO(estade): don't show the dialog if the site didn't specify the right
   // fields. First we must figure out what the "right" fields are.
   SuggestionsUpdated();
@@ -1166,14 +1189,13 @@ void AutofillDialogControllerImpl::RestoreUserInputFromSnapshot(
   if (snapshot.empty())
     return;
 
-  FieldMapWrapper wrapper(snapshot);
   for (size_t i = SECTION_MIN; i <= SECTION_MAX; ++i) {
     DialogSection section = static_cast<DialogSection>(i);
     if (!SectionIsActive(section))
       continue;
 
     DetailInputs* inputs = MutableRequestedFieldsForSection(section);
-    wrapper.FillInputs(inputs);
+    FieldMapWrapper(snapshot, section).FillInputs(inputs);
 
     for (size_t i = 0; i < inputs->size(); ++i) {
       if (InputWasEdited((*inputs)[i].type, (*inputs)[i].initial_value)) {
@@ -1652,7 +1674,14 @@ base::string16 AutofillDialogControllerImpl::InputValidityMessage(
     }
   }
 
-  switch (AutofillType(type).GetStorableType()) {
+  AutofillType autofill_type(type);
+  if (i18ninput::Enabled() &&
+      (autofill_type.group() == ADDRESS_HOME ||
+       autofill_type.group() == ADDRESS_BILLING)) {
+    return base::string16();
+  }
+
+  switch (autofill_type.GetStorableType()) {
     case EMAIL_ADDRESS:
       if (!value.empty() && !IsValidEmailAddress(value)) {
         return l10n_util::GetStringUTF16(
@@ -1703,8 +1732,9 @@ base::string16 AutofillDialogControllerImpl::InputValidityMessage(
       break;
 
     case ADDRESS_HOME_STATE:
-      if (!value.empty() && !autofill::IsValidState(value) &&
+      if (!value.empty() &&!autofill::IsValidState(value) &&
           CountryCodeForSection(section) == "US") {
+        DCHECK(!i18ninput::Enabled());
         return l10n_util::GetStringUTF16(
             IDS_AUTOFILL_DIALOG_VALIDATION_INVALID_REGION);
       }
@@ -1713,6 +1743,7 @@ base::string16 AutofillDialogControllerImpl::InputValidityMessage(
     case ADDRESS_HOME_ZIP:
       if (!value.empty() && !autofill::IsValidZip(value) &&
           CountryCodeForSection(section) == "US") {
+        DCHECK(!i18ninput::Enabled());
         return l10n_util::GetStringUTF16(
             IDS_AUTOFILL_DIALOG_VALIDATION_INVALID_ZIP_CODE);
       }
@@ -1749,10 +1780,37 @@ ValidityMessages AutofillDialogControllerImpl::InputsAreValid(
     DialogSection section,
     const FieldValueMap& inputs) {
   ValidityMessages messages;
+  if (inputs.empty())
+    return messages;
+
   FieldValueMap field_values;
+
+  if (i18ninput::Enabled() && section != SECTION_CC) {
+    AddressProblems problems;
+    FieldMapWrapper wrapper(inputs, section);
+    AddressData address_data = i18ninput::CreateAddressData(
+        base::Bind(&FieldMapWrapper::GetInfo, base::Unretained(&wrapper)));
+    DCHECK_EQ(2U, address_data.country_code.size());
+    if (validator_->ValidateAddress(address_data,
+                                    AddressProblemFilter(),
+                                    &problems) == AddressValidator::SUCCESS) {
+      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),
+                     ValidityMessage(text, sure));
+      }
+    }
+  }
+
   for (FieldValueMap::const_iterator iter = inputs.begin();
        iter != inputs.end(); ++iter) {
     const ServerFieldType type = iter->first;
+    if (!messages.GetMessageOrDefault(type).text.empty())
+      continue;
 
     base::string16 text = InputValidityMessage(section, type, iter->second);
 
@@ -2579,7 +2637,6 @@ AutofillDialogControllerImpl::AutofillDialogControllerImpl(
       suggested_shipping_(this),
       cares_about_shipping_(true),
       popup_input_type_(UNKNOWN_TYPE),
-      weak_ptr_factory_(this),
       waiting_for_explicit_sign_in_response_(false),
       has_accepted_legal_documents_(false),
       is_submitting_(false),
@@ -2587,7 +2644,8 @@ AutofillDialogControllerImpl::AutofillDialogControllerImpl(
       wallet_server_validation_recoverable_(true),
       data_was_passed_back_(false),
       was_ui_latency_logged_(false),
-      card_generated_animation_(2000, 60, this) {
+      card_generated_animation_(2000, 60, this),
+      weak_ptr_factory_(this) {
   // TODO(estade): remove duplicates from |form_structure|?
   DCHECK(!callback_.is_null());
 }
@@ -3109,6 +3167,10 @@ bool AutofillDialogControllerImpl::RebuildInputsForCountry(
   std::string country_code = AutofillCountry::GetCountryCode(
       country_name, g_browser_process->GetApplicationLocale());
   common::BuildInputsForSection(section, country_code, inputs);
+
+  if (i18ninput::Enabled())
+    validator_->LoadRules(country_code);
+
   return true;
 }
 
@@ -3402,6 +3464,12 @@ void AutofillDialogControllerImpl::AnimationEnded(
   DoFinishSubmit();
 }
 
+void AutofillDialogControllerImpl::OnAddressValidationRulesLoaded(
+    const std::string& country_code,
+    bool success) {
+  // TODO(dbeam): ask |view_| to re-validate its contents if necessary.
+}
+
 void AutofillDialogControllerImpl::DoFinishSubmit() {
   FillOutputForSection(SECTION_CC);
   FillOutputForSection(SECTION_BILLING);