Reland: Normalize shipping address for merchant on Desktop.

chrome/browser/ui/views/payments/shipping_address_editor_view_controller_browsertest.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 <algorithm>
 
 #include "base/memory/ptr_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/ui/views/payments/payment_request_browsertest_base.h"
 #include "chrome/browser/ui/views/payments/payment_request_dialog_view_ids.h"
@@ skipping 24 matching lines @@
     : public PaymentRequestBrowserTestBase,
       public TestChromePaymentRequestDelegate::AddressInputProvider {
  protected:
   PaymentRequestShippingAddressEditorTest()
       : PaymentRequestBrowserTestBase(
             "/payment_request_dynamic_shipping_test.html") {}
 
   void EnableAddressInputOverride() { SetAddressInputOverride(this); }
 
   // TestChromePaymentRequestDelegate::AddressInputProvider.
-  std::unique_ptr<const ::i18n::addressinput::Source> GetAddressInputSource()
+  std::unique_ptr<::i18n::addressinput::Source> GetAddressInputSource()
       override {
     return base::MakeUnique<TestSource>(address_input_override_data_);
   }
 
   std::unique_ptr<::i18n::addressinput::Storage> GetAddressInputStorage()
       override {
     return base::MakeUnique<::i18n::addressinput::NullStorage>();
   }
 
   void SetFieldTestValue(autofill::ServerFieldType type) {
@@ skipping 313 matching lines @@
   data_loop.Run();
 
   ASSERT_EQ(1UL, personal_data_manager->GetProfiles().size());
   autofill::AutofillProfile* profile = personal_data_manager->GetProfiles()[0];
   DCHECK(profile);
   EXPECT_EQ(base::ASCIIToUTF16("any state"),
             profile->GetRawInfo(autofill::ADDRESS_HOME_STATE));
 }
 
 }  // namespace payments