Layered component for web payments

content/test/BUILD.gn

Index: content/test/BUILD.gn
diff --git a/content/test/BUILD.gn b/content/test/BUILD.gn
index 9d993b30102559afbfb813e33d2e453c41964a64..c12cd8e7c526403e08124e840f42bcc3de4a3ddc 100644
--- a/content/test/BUILD.gn
+++ b/content/test/BUILD.gn
@@ -237,7 +237,7 @@ static_library("test_support") {
     "//cc/surfaces",
     "//components/display_compositor",
     "//components/leveldb/public/interfaces",
-    "//components/payments:payment_app",
+    "//components/payments/content:payment_app",
     "//content/app:both_for_content_tests",
     "//content/browser:for_content_tests",
     "//content/browser/speech/proto",
@@ -698,7 +698,7 @@ test("content_browsertests") {
     "//components/discardable_memory/client",
     "//components/discardable_memory/common",
     "//components/discardable_memory/service",
-    "//components/payments:payment_app",
+    "//components/payments/content:payment_app",
     "//content:resources",
     "//content/app:both_for_content_tests",
     "//content/browser:for_content_tests",
@@ -1442,8 +1442,8 @@ test("content_unittests") {
     "//cc/surfaces",
     "//components/display_compositor",
     "//components/leveldb/public/cpp",
-    "//components/payments:payment_app",
-    "//components/payments:payment_request",
+    "//components/payments/content:payment_app",
+    "//components/payments/content:payment_request",
     "//components/rappor:test_support",
     "//content:resources",
     "//content/app:both_for_content_tests",