Canonicalize non-US administrative areas when creating new wallet addresses

Also fix address input validation of street address (we were failing to copy the street address into the AddressData struct before validating).

BUG=340905

Review URL: https://codereview.chromium.org/154423004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@249354 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 19 insertions, 0 deletions

diff --git a/third_party/libaddressinput/chromium/cpp/include/libaddressinput/address_validator.h b/third_party/libaddressinput/chromium/cpp/include/libaddressinput/address_validator.h
index a23684d..50f7726 100644
--- a/third_party/libaddressinput/chromium/cpp/include/libaddressinput/address_validator.h
+++ b/third_party/libaddressinput/chromium/cpp/include/libaddressinput/address_validator.h
@@ -119,6 +119,12 @@ class AddressValidator {
   virtual Status ValidateAddress(const AddressData& address,
                                  const AddressProblemFilter& filter,
                                  AddressProblems* problems) const = 0;
+
+  // Canonicalizes the administrative area in |address_data|. For example,
+  // "texas" changes to "TX". Returns true on success, otherwise leaves
+  // |address_data| alone and returns false.
+  virtual bool CanonicalizeAdministrativeArea(AddressData* address_data)
+      const = 0;
 };
 
 }  // namespace addressinput
diff --git a/third_party/libaddressinput/chromium/cpp/src/address_validator.cc b/third_party/libaddressinput/chromium/cpp/src/address_validator.cc
index fe1b7502..33453fb 100644
--- a/third_party/libaddressinput/chromium/cpp/src/address_validator.cc
+++ b/third_party/libaddressinput/chromium/cpp/src/address_validator.cc
@@ -188,6 +188,19 @@ class AddressValidatorImpl : public AddressValidator {
     return SUCCESS;
   }
 
+  virtual bool CanonicalizeAdministrativeArea(AddressData* address_data) const {
+    std::map<std::string, const Ruleset*>::const_iterator ruleset_it =
+        rules_.find(address_data->country_code);
+    if (ruleset_it == rules_.end()) {
+      return false;
+    }
+    const Rule& rule =
+        ruleset_it->second->GetLanguageCodeRule(address_data->language_code);
+
+    return rule.CanonicalizeSubKey(address_data->administrative_area,
+                                   &address_data->administrative_area);
+  }
+
  private:
   // Called when CountryRulesAggregator::AggregateRules loads the |ruleset| for
   // the |country_code|.