Revert of [Payments] move //components/payments/content/*.mojom files to //components/payments/mojom

components/payments/content/BUILD.gn

Index: components/payments/content/BUILD.gn
diff --git a/components/payments/content/BUILD.gn b/components/payments/content/BUILD.gn
index e0e82f089318144d7a9f57110a93139951e025f3..c586afe4aeeabd8d38ba2cd69849b1e3ab1fc342 100644
--- a/components/payments/content/BUILD.gn
+++ b/components/payments/content/BUILD.gn
@@ -1,6 +1,8 @@
 # Copyright 2016 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.
+
+import("//mojo/public/tools/bindings/mojom.gni")
 
 static_library("content") {
   sources = [
@@ -18,12 +20,40 @@
   ]
 
   deps = [
+    ":mojom",
     ":utils",
     "//components/autofill/core/browser",
     "//components/payments/core",
-    "//components/payments/mojom",
     "//content/public/browser",
     "//mojo/public/cpp/bindings",
+  ]
+}
+
+mojom("mojom") {
+  sources = [
+    "payment_request.mojom",
+  ]
+}
+
+mojom("mojom_parser") {
+  sources = [
+    "payment_manifest_parser.mojom",
+  ]
+
+  public_deps = [
+    "//url/mojo:url_mojom_gurl",
+  ]
+}
+
+mojom("mojom_payment_app") {
+  sources = [
+    "payment_app.mojom",
+  ]
+
+  public_deps = [
+    ":mojom",
+    "//mojo/common:common_custom_types",
+    "//url/mojo:url_mojom_gurl",
   ]
 }
 
@@ -40,13 +70,13 @@
   ]
 
   deps = [
+    ":mojom",
+    ":mojom_parser",
     "//base",
     "//components/autofill/core/browser",
     "//components/data_use_measurement/core",
     "//components/link_header_util",
     "//components/payments/core",
-    "//components/payments/mojom",
-    "//components/payments/mojom:mojom_parser",
     "//components/strings",
     "//content/public/browser",
     "//net",
@@ -73,13 +103,13 @@
 
   deps = [
     ":content",
+    ":mojom",
     ":utils",
     "//base",
     "//base/test:test_support",
     "//components/autofill/core/browser",
     "//components/autofill/core/browser:test_support",
     "//components/payments/core",
-    "//components/payments/mojom",
     "//content/test:test_support",
     "//net:test_support",
     "//testing/gtest",