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

chrome/browser/ui/views/payments/test_chrome_payment_request_delegate.cc

 // 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.
 
 #include "chrome/browser/ui/views/payments/test_chrome_payment_request_delegate.h"
 
 #include <utility>
 
 #include "content/public/browser/web_contents.h"
 #include "ui/views/widget/widget.h"
@@ skipping 27 matching lines @@
 }
 
 bool TestChromePaymentRequestDelegate::IsIncognito() const {
   return is_incognito_;
 }
 
 bool TestChromePaymentRequestDelegate::IsSslCertificateValid() {
   return is_valid_ssl_;
 }
 
-std::unique_ptr<const ::i18n::addressinput::Source>
+std::unique_ptr<::i18n::addressinput::Source>
 TestChromePaymentRequestDelegate::GetAddressInputSource() {
   if (address_input_provider_)
     return address_input_provider_->GetAddressInputSource();
   return ChromePaymentRequestDelegate::GetAddressInputSource();
 }
 
 std::unique_ptr<::i18n::addressinput::Storage>
 TestChromePaymentRequestDelegate::GetAddressInputStorage() {
   if (address_input_provider_)
     return address_input_provider_->GetAddressInputStorage();
   return ChromePaymentRequestDelegate::GetAddressInputStorage();
 }
 
 }  // namespace payments