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

chrome/browser/ui/views/payments/test_chrome_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 CHROME_BROWSER_UI_VIEWS_PAYMENTS_TEST_CHROME_PAYMENT_REQUEST_DELEGATE_H_
 #define CHROME_BROWSER_UI_VIEWS_PAYMENTS_TEST_CHROME_PAYMENT_REQUEST_DELEGATE_H_
 
 #include <memory>
 
 #include "base/macros.h"
@@ skipping 18 matching lines @@
   TestChromePaymentRequestDelegate(
       content::WebContents* web_contents,
       PaymentRequestDialogView::ObserverForTest* observer,
       views::WidgetObserver* widget_observer,
       bool is_incognito,
       bool is_valid_ssl);
 
   // This class allows tests to provide their own AddressInput data.
   class AddressInputProvider {
    public:
-    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;
   };
 
   void SetAddressInputOverride(AddressInputProvider* address_input_provider) {
     address_input_provider_ = address_input_provider;
   }
 
   // ChromePaymentRequestDelegate.
   void ShowDialog(PaymentRequest* request) override;
   bool IsIncognito() const override;
   bool IsSslCertificateValid() override;
-  std::unique_ptr<const ::i18n::addressinput::Source> GetAddressInputSource()
+  std::unique_ptr<::i18n::addressinput::Source> GetAddressInputSource()
       override;
   std::unique_ptr<::i18n::addressinput::Storage> GetAddressInputStorage()
       override;
 
   PaymentRequestDialogView* dialog_view() {
     return static_cast<PaymentRequestDialogView*>(dialog_);
   }
 
  private:
   // Not owned so must outlive the PaymentRequest object;
   AddressInputProvider* address_input_provider_;
 
   PaymentRequestDialogView::ObserverForTest* observer_;
   views::WidgetObserver* widget_observer_;
   bool is_incognito_;
   bool is_valid_ssl_;
 
   DISALLOW_COPY_AND_ASSIGN(TestChromePaymentRequestDelegate);
 };
 
 }  // namespace payments
 
 #endif  // CHROME_BROWSER_UI_VIEWS_PAYMENTS_TEST_CHROME_PAYMENT_REQUEST_DELEGATE_H_