1 files changed, 37 insertions, 5 deletions

diff --git a/chromium/components/payments/core/BUILD.gn b/chromium/components/payments/core/BUILD.gn
index 1892be27352..eaa3d417ba7 100644
--- a/chromium/components/payments/core/BUILD.gn
+++ b/chromium/components/payments/core/BUILD.gn
@@ -4,12 +4,17 @@
 
 static_library("core") {
   sources = [
-    "address_normalizer.cc",
+    "address_normalization_manager.cc",
+    "address_normalization_manager.h",
     "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",
+    "can_make_payment_query.cc",
+    "can_make_payment_query.h",
     "currency_formatter.cc",
     "currency_formatter.h",
     "journey_logger.cc",
@@ -21,18 +26,24 @@ static_library("core") {
     "payment_method_data.cc",
     "payment_method_data.h",
     "payment_options_provider.h",
+    "payment_prefs.cc",
+    "payment_prefs.h",
     "payment_request_data_util.cc",
     "payment_request_data_util.h",
     "payment_request_delegate.h",
-    "profile_util.cc",
-    "profile_util.h",
+    "payments_profile_comparator.cc",
+    "payments_profile_comparator.h",
     "strings_util.cc",
     "strings_util.h",
+    "subkey_requester.cc",
+    "subkey_requester.h",
   ]
 
   deps = [
     "//base",
     "//components/autofill/core/browser",
+    "//components/keyed_service/core",
+    "//components/pref_registry",
     "//components/strings:components_strings_grit",
     "//components/ukm",
     "//third_party/libphonenumber",
@@ -46,10 +57,27 @@ static_library("core") {
   ]
 }
 
+static_library("test_support") {
+  testonly = true
+  sources = [
+    "test_address_normalizer.cc",
+    "test_address_normalizer.h",
+    "test_payment_request_delegate.cc",
+    "test_payment_request_delegate.h",
+  ]
+
+  deps = [
+    ":core",
+    "//base",
+    "//components/autofill/core/browser",
+  ]
+}
+
 source_set("unit_tests") {
   testonly = true
   sources = [
-    "address_normalizer_unittest.cc",
+    "address_normalization_manager_unittest.cc",
+    "address_normalizer_impl_unittest.cc",
     "autofill_payment_instrument_unittest.cc",
     "basic_card_response_unittest.cc",
     "currency_formatter_unittest.cc",
@@ -57,20 +85,24 @@ source_set("unit_tests") {
     "payment_address_unittest.cc",
     "payment_method_data_unittest.cc",
     "payment_request_data_util_unittest.cc",
-    "profile_util_unittest.cc",
+    "payments_profile_comparator_unittest.cc",
+    "subkey_requester_unittest.cc",
   ]
 
   deps = [
     ":core",
+    ":test_support",
     "//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",
   ]
 }