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

components/payments/core/payment_request_delegate.h

 // Copyright 2017 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.
 
 #ifndef COMPONENTS_PAYMENTS_CORE_PAYMENT_REQUEST_DELEGATE_H_
 #define COMPONENTS_PAYMENTS_CORE_PAYMENT_REQUEST_DELEGATE_H_
 
 #include <memory>
 #include <string>
 
@@ skipping 11 matching lines @@
 }  // namespace addressinput
 }  // namespace i18n
 
 namespace autofill {
 class CreditCard;
 class PersonalDataManager;
 }  // namespace autofill
 
 namespace payments {
 
+class AddressNormalizer;
 class PaymentRequest;
 
 class PaymentRequestDelegate {
  public:
   virtual ~PaymentRequestDelegate() {}
 
   // Shows the Payment Request dialog for the given |request|.
   virtual void ShowDialog(PaymentRequest* request) = 0;
 
   // Closes the same dialog that was opened by this delegate. Must be safe to
@@ skipping 20 matching lines @@
   // Returns the URL of the page that is currently being displayed.
   virtual const GURL& GetLastCommittedURL() const = 0;
 
   // Starts a FullCardRequest to unmask |credit_card|.
   virtual void DoFullCardRequest(
       const autofill::CreditCard& credit_card,
       base::WeakPtr<autofill::payments::FullCardRequest::ResultDelegate>
           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
 
 #endif  // COMPONENTS_PAYMENTS_CORE_PAYMENT_REQUEST_DELEGATE_H_