[Payments] Normalize Shipping Address sent to merchant on Desktop.

components/payments/core/payment_request_delegate.h

Index: components/payments/core/payment_request_delegate.h
diff --git a/components/payments/core/payment_request_delegate.h b/components/payments/core/payment_request_delegate.h
index 8ebc229dfe37a5f8c68ead87d8aca59945a11ed0..1ab49891317b55d5856246d74e24d890c4e11978 100644
--- a/components/payments/core/payment_request_delegate.h
+++ b/components/payments/core/payment_request_delegate.h
@@ -29,6 +29,7 @@ class PersonalDataManager;
 
 namespace payments {
 
+class AddressNormalizer;
 class PaymentRequest;
 
 class PaymentRequestDelegate {
@@ -69,10 +70,14 @@ class PaymentRequestDelegate {
           result_delegate) = 0;
 
   // Returns the source and storage for country/region data loads.
-  virtual std::unique_ptr<const ::i18n::addressinput::Source>
+  virtual std::unique_ptr<::i18n::addressinput::Source>
   GetAddressInputSource() = 0;
   virtual std::unique_ptr<::i18n::addressinput::Storage>
   GetAddressInputStorage() = 0;
+
+  // Returns a pointer to the address normalizer to use for the duration of this
+  // Payment Request.
+  virtual AddressNormalizer* GetAddressNormalizer() = 0;
 };
 
 }  // namespace payments