[Payments] Normalize addresses before passing them to merchants.

third_party/libaddressinput/chromium/chrome_address_validator.cc

Index: third_party/libaddressinput/chromium/chrome_address_validator.cc
diff --git a/third_party/libaddressinput/chromium/chrome_address_validator.cc b/third_party/libaddressinput/chromium/chrome_address_validator.cc
index ef11a62fb1c818c77e6613710bd2ab8041ca4b31..8b1697cac2e6de210e9672e00f5fd1d2165b3c94 100644
--- a/third_party/libaddressinput/chromium/chrome_address_validator.cc
+++ b/third_party/libaddressinput/chromium/chrome_address_validator.cc
@@ -112,8 +112,7 @@ AddressValidator::Status AddressValidator::GetSuggestions(
   return SUCCESS;
 }
 
-bool AddressValidator::CanonicalizeAdministrativeArea(
-    AddressData* address) const {
+bool AddressValidator::NormalizeAddress(AddressData* address) const {
   if (!supplier_->IsLoaded(address->region_code))

[please use gerrit instead, 2016/09/23 09:04:41]

If you expose supplier_->IsLoaded(region_code) through a method like
AddressValidator::AreRulesLoadedForRegion(region_codes), then you can remove the
"loaded_rules_" mapping in personal_data_manager_android.cc.

[sebsg, 2016/09/27 18:48:38]

Done.

     return false;
 
@@ -121,6 +120,8 @@ bool AddressValidator::CanonicalizeAdministrativeArea(
   AddressData tmp(*address);
   normalizer_->Normalize(&tmp);
   address->administrative_area = tmp.administrative_area;
+  address->locality = tmp.locality;
+  address->dependent_locality = tmp.dependent_locality;

[please use gerrit instead, 2016/09/23 09:04:41]

You can simplify lines 119-124 now:

normalizer_->Normalize(address);

[sebsg, 2016/09/27 18:48:38]

Done.

 
   return true;
 }