Reland 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 a20079996c5a582ade6e8d640364213fff36ca18..ac16b7b52f1a23479ed5de6c9b3a32f478819aa1 100644
--- a/components/payments/content/BUILD.gn
+++ b/components/payments/content/BUILD.gn
@@ -1,8 +1,6 @@
 # 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 = [
@@ -20,41 +18,13 @@
   ]
 
   deps = [
-    ":mojom",
     ":utils",
     "//components/autofill/core/browser",
     "//components/payments/core",
+    "//components/payments/mojom",
     "//content/public/browser",
     "//mojo/public/cpp/bindings",
     "//third_party/libphonenumber",
-  ]
-}
-
-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",
   ]
 }
 
@@ -71,13 +41,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",
@@ -104,13 +74,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",