Reland "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>
 
@@ skipping 62 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/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/messages.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/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::ADMIN_AREA;
+using ::i18n::addressinput::DEPENDENT_LOCALITY;
+using ::i18n::addressinput::Downloader;
+using ::i18n::addressinput::FieldProblemMap;
+using ::i18n::addressinput::Localization;
+using ::i18n::addressinput::MISSING_REQUIRED_FIELD;
 
 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 734 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(),
+  validator_.reset(new AddressValidator(
+      I18N_ADDRESS_VALIDATION_DATA_URL,
+      scoped_ptr<Downloader>(
+          new autofill::ChromeDownloaderImpl(profile_->GetRequestContext())),
       ValidationRulesStorageFactory::CreateStorage(),
-      this);
+      this));
 
   SuggestionsUpdated();
   SubmitButtonDelayBegin();
   view_.reset(CreateView());
   view_->Show();
   GetManager()->AddObserver(this);
 
   if (!account_chooser_model_->WalletIsSelected())
     LogDialogLatencyToShow();
 }
@@ skipping 1051 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 11 matching lines @@
 
     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) :
+                             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;
   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);
+    Localization localization;
+    localization.SetGetter(l10n_util::GetStringUTF8);
+    FieldProblemMap problems;
+    status = GetValidator()->ValidateAddress(*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 != MISSING_REQUIRED_FIELD;
+      base::string16 text = base::UTF8ToUTF16(localization.GetErrorMessage(
+          *address_data, iter->first, iter->second, true, 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
@@ skipping 1399 matching lines @@
     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());
-    for (int field = ::i18n::addressinput::DEPENDENT_LOCALITY;
-         field >= ::i18n::addressinput::ADMIN_AREA;
-         --field) {
+    for (int field = DEPENDENT_LOCALITY; field >= ADMIN_AREA; --field) {
       const std::string& field_value =
           i18n_validator_suggestions_[i].GetFieldValue(
               static_cast<AddressField>(field));
       if (focused_field != field && !field_value.empty()) {
         popup_labels->back().assign(base::UTF8ToUTF16(field_value));
         break;
       }
     }
   }
   popup_icons->resize(popup_values->size());
@@ skipping 162 matching lines @@
 
   FieldValueMap detail_outputs;
   view_->GetUserInput(section, &detail_outputs);
   return !InputsAreValid(section, detail_outputs).HasSureErrors();
 }
 
 bool AutofillDialogControllerImpl::RulesAreLoaded(DialogSection section) {
   AddressData address_data;
   address_data.region_code = CountryCodeForSection(section);
   AddressValidator::Status status = GetValidator()->ValidateAddress(
-      address_data, AddressProblemFilter(), NULL);
+      address_data, NULL, NULL);
   return status == AddressValidator::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 31 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()->ValidateAddress(*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 478 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