[Payments] Normalize addresses before passing them to merchants.

third_party/libaddressinput/chromium/chrome_address_validator.cc

 // Copyright 2014 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 "third_party/libaddressinput/chromium/chrome_address_validator.h"
 
 #include <cmath>
 
 #include "base/bind.h"
 #include "base/location.h"
@@ skipping 94 matching lines @@
 
   if (focused_field == POSTAL_CODE ||
       (focused_field >= ADMIN_AREA && focused_field <= DEPENDENT_LOCALITY)) {
     input_suggester_->GetSuggestions(
         user_input, focused_field, suggestion_limit, suggestions);
   }
 
   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;
 
   // TODO: It would probably be beneficial to use the full canonicalization.
   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;
 }
 
 AddressValidator::AddressValidator()
     : load_rules_listener_(NULL), weak_factory_(this) {}
 
 base::TimeDelta AddressValidator::GetBaseRetryPeriod() const {
   return base::TimeDelta::FromSeconds(8);
 }
@@ skipping 19 matching lines @@
                             weak_factory_.GetWeakPtr(), region_code),
       GetBaseRetryPeriod() * pow(2, attempts_number_[region_code]++));
 }
 
 void AddressValidator::RetryLoadRules(const std::string& region_code) {
   // Do not reset retry count.
   supplier_->LoadRules(region_code, *rules_loaded_);
 }
 
 }  // namespace autofill