[Payments] Normalize addresses before passing them to merchants.

third_party/libaddressinput/chromium/chrome_address_validator.h

Index: third_party/libaddressinput/chromium/chrome_address_validator.h
diff --git a/third_party/libaddressinput/chromium/chrome_address_validator.h b/third_party/libaddressinput/chromium/chrome_address_validator.h
index de5b39b71ef64fa2275c50d8d0028059443ab05f..43a4a4061ccbe3d5bf1caa2d99808341d71201dd 100644
--- a/third_party/libaddressinput/chromium/chrome_address_validator.h
+++ b/third_party/libaddressinput/chromium/chrome_address_validator.h
@@ -135,12 +135,15 @@ class AddressValidator {
       size_t suggestion_limit,
       std::vector< ::i18n::addressinput::AddressData>* suggestions) const;
 
-  // 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(
+  // Normalizes the |address_data|. For example, "texas" changes to "TX".
+  // Returns true on success, otherwise leaves |address_data| alone and returns
+  // false.
+  virtual bool NormalizeAddress(
       ::i18n::addressinput::AddressData* address) const;
 
+  // Returns whether the rules associated with the |region_code| are loaded.
+  virtual bool AreRulesLoadedForRegion(const std::string& region_code);
+
  protected:
   // Constructor used only for MockAddressValidator.
   AddressValidator();