Reland: Normalize shipping address for merchant on Desktop.

components/payments/core/BUILD.gn

 # 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.
 
 static_library("core") {
   sources = [
-    "address_normalizer.cc",
     "address_normalizer.h",
+    "address_normalizer_impl.cc",
+    "address_normalizer_impl.h",
     "autofill_payment_instrument.cc",
     "autofill_payment_instrument.h",
     "basic_card_response.cc",
     "basic_card_response.h",
     "currency_formatter.cc",
     "currency_formatter.h",
     "journey_logger.cc",
     "journey_logger.h",
     "payment_address.cc",
     "payment_address.h",
@@ skipping 23 matching lines @@
 
   public_deps = [
     "//third_party/icu",
     "//third_party/libaddressinput",
   ]
 }
 
 source_set("unit_tests") {
   testonly = true
   sources = [
-    "address_normalizer_unittest.cc",
+    "address_normalizer_impl_unittest.cc",
     "autofill_payment_instrument_unittest.cc",
     "basic_card_response_unittest.cc",
     "currency_formatter_unittest.cc",
     "journey_logger_unittest.cc",
     "payment_address_unittest.cc",
     "payment_method_data_unittest.cc",
     "payment_request_data_util_unittest.cc",
     "profile_util_unittest.cc",
   ]
 
   deps = [
     ":core",
     "//base",
     "//base/test:test_support",
     "//components/autofill/core/browser",
     "//components/autofill/core/browser:test_support",
     "//components/metrics/proto",
     "//components/strings:components_strings_grit",
     "//components/ukm",
     "//components/ukm:test_support",
     "//testing/gmock",
     "//testing/gtest",
     "//third_party/libaddressinput:test_support",
     "//ui/base",
   ]
 }