move //components/payments/content/*.mojom files to //components/payments/mojom
To break dependency of //components/webdata_services on //components/payments/content after
landing https://codereview.chromium.org/2801513002/
BUG=711952
Review-Url: https://codereview.chromium.org/2811593009
Cr-Original-Original-Commit-Position: refs/heads/master@{#464877}
Committed: https://chromium.googlesource.com/chromium/src/+/b1b326893990633387f90546607ce8271d151a3a
Review-Url: https://codereview.chromium.org/2811593009
Cr-Original-Commit-Position: refs/heads/master@{#464882}
Committed: https://chromium.googlesource.com/chromium/src/+/3e1cedb46b52e6c09243993671a5a0ddb7a4eeed
Review-Url: https://codereview.chromium.org/2811593009
Cr-Commit-Position: refs/heads/master@{#464892}
diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
index 2d73b88..74ae6d7 100644
--- a/chrome/android/BUILD.gn
+++ b/chrome/android/BUILD.gn
@@ -185,9 +185,9 @@
"//components/navigation_interception/android:navigation_interception_java",
"//components/ntp_tiles/android:ntp_tiles_java",
"//components/offline_items_collection/core:core_java",
- "//components/payments/content:mojom_java",
- "//components/payments/content:mojom_parser_java",
"//components/payments/content/android:java",
+ "//components/payments/mojom:mojom_java",
+ "//components/payments/mojom:mojom_parser_java",
"//components/policy/android:policy_java",
"//components/precache/android:precache_java",
"//components/safe_browsing_db/android:safe_browsing_java",
@@ -348,9 +348,9 @@
"//components/invalidation/impl:java",
"//components/minidump_uploader:minidump_uploader_java",
"//components/offline_items_collection/core:core_java",
- "//components/payments/content:mojom_java",
- "//components/payments/content:mojom_parser_java",
"//components/payments/content/android:java",
+ "//components/payments/mojom:mojom_java",
+ "//components/payments/mojom:mojom_parser_java",
"//components/signin/core/browser/android:java",
"//components/signin/core/browser/android:signin_java_test_support",
"//components/sync:sync_java_test_support",
@@ -435,9 +435,9 @@
"//components/minidump_uploader:minidump_uploader_javatests",
"//components/navigation_interception/android:navigation_interception_java",
"//components/offline_items_collection/core:core_java",
- "//components/payments/content:mojom_java",
- "//components/payments/content:mojom_parser_java",
"//components/payments/content/android:java",
+ "//components/payments/mojom:mojom_java",
+ "//components/payments/mojom:mojom_parser_java",
"//components/policy/android:policy_java",
"//components/precache/android:precache_java",
"//components/precache/android:precache_javatests",
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
index ab942d6..fbf1c51 100644
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -1514,8 +1514,8 @@
"//components/password_manager/core/browser",
"//components/password_manager/core/common",
"//components/password_manager/sync/browser",
- "//components/payments/content:mojom",
- "//components/payments/content:mojom_payment_app",
+ "//components/payments/mojom",
+ "//components/payments/mojom:mojom_payment_app",
"//components/physical_web/eddystone",
"//components/policy:generated",
"//components/policy/core/browser",
diff --git a/chrome/browser/android/payments/service_worker_payment_app_bridge.cc b/chrome/browser/android/payments/service_worker_payment_app_bridge.cc
index 260f37c7..6f08a1a 100644
--- a/chrome/browser/android/payments/service_worker_payment_app_bridge.cc
+++ b/chrome/browser/android/payments/service_worker_payment_app_bridge.cc
@@ -10,7 +10,7 @@
#include "base/android/jni_string.h"
#include "base/android/scoped_java_ref.h"
#include "chrome/browser/profiles/profile_manager.h"
-#include "components/payments/content/payment_app.mojom.h"
+#include "components/payments/mojom/payment_app.mojom.h"
#include "content/public/browser/browser_thread.h"
#include "content/public/browser/payment_app_provider.h"
#include "content/public/browser/web_contents.h"
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
index 260c28e2..9679ace6 100644
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -283,7 +283,7 @@
#include "chrome/browser/android/service_tab_launcher.h"
#include "chrome/browser/android/tab_android.h"
#include "chrome/browser/android/webapps/single_tab_mode_tab_helper.h"
-#include "components/payments/content/payment_request.mojom.h"
+#include "components/payments/mojom/payment_request.mojom.h"
#include "content/public/browser/android/java_interfaces.h"
#include "ui/base/ui_base_paths.h"
#else
diff --git a/chrome/browser/payments/payment_request_factory.h b/chrome/browser/payments/payment_request_factory.h
index f2120f29..f77e1bf 100644
--- a/chrome/browser/payments/payment_request_factory.h
+++ b/chrome/browser/payments/payment_request_factory.h
@@ -5,7 +5,7 @@
#ifndef CHROME_BROWSER_PAYMENTS_PAYMENT_REQUEST_FACTORY_H_
#define CHROME_BROWSER_PAYMENTS_PAYMENT_REQUEST_FACTORY_H_
-#include "components/payments/content/payment_request.mojom.h"
+#include "components/payments/mojom/payment_request.mojom.h"
#include "mojo/public/cpp/bindings/binding.h"
namespace content {
diff --git a/chrome/browser/ui/views/payments/payment_request_browsertest_base.h b/chrome/browser/ui/views/payments/payment_request_browsertest_base.h
index 3f90fe8..dd39f3b 100644
--- a/chrome/browser/ui/views/payments/payment_request_browsertest_base.h
+++ b/chrome/browser/ui/views/payments/payment_request_browsertest_base.h
@@ -20,7 +20,7 @@
#include "components/autofill/core/browser/field_types.h"
#include "components/autofill/core/browser/personal_data_manager_observer.h"
#include "components/payments/content/payment_request.h"
-#include "components/payments/content/payment_request.mojom.h"
+#include "components/payments/mojom/payment_request.mojom.h"
#include "net/test/embedded_test_server/embedded_test_server.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "ui/views/widget/widget_observer.h"
diff --git a/chrome/browser/ui/views/payments/payment_request_views_util.h b/chrome/browser/ui/views/payments/payment_request_views_util.h
index 189618aa..a6a2ef0 100644
--- a/chrome/browser/ui/views/payments/payment_request_views_util.h
+++ b/chrome/browser/ui/views/payments/payment_request_views_util.h
@@ -9,7 +9,7 @@
#include <string>
#include "base/strings/string16.h"
-#include "components/payments/content/payment_request.mojom.h"
+#include "components/payments/mojom/payment_request.mojom.h"
namespace autofill {
class AutofillProfile;
diff --git a/components/payments/android/BUILD.gn b/components/payments/android/BUILD.gn
index fc5fe8b9..7eac568b 100644
--- a/components/payments/android/BUILD.gn
+++ b/components/payments/android/BUILD.gn
@@ -11,7 +11,7 @@
]
deps = [
- "//components/payments/content:mojom_parser",
+ "//components/payments/mojom:mojom_parser",
"//components/webdata/common",
"//sql",
]
diff --git a/components/payments/android/DEPS b/components/payments/android/DEPS
index 0d58d2f..6d4be5a9 100644
--- a/components/payments/android/DEPS
+++ b/components/payments/android/DEPS
@@ -1,5 +1,5 @@
include_rules = [
- "+components/payments/content",
+ "-components/payments/content",
"+components/webdata/common",
"+sql",
]
\ No newline at end of file
diff --git a/components/payments/android/web_app_manifest_section_table.h b/components/payments/android/web_app_manifest_section_table.h
index 44a5c046..7c46bcc 100644
--- a/components/payments/android/web_app_manifest_section_table.h
+++ b/components/payments/android/web_app_manifest_section_table.h
@@ -8,7 +8,7 @@
#include <string>
#include <vector>
-#include "components/payments/content/payment_manifest_parser.mojom.h"
+#include "components/payments/mojom/payment_manifest_parser.mojom.h"
#include "components/webdata/common/web_database.h"
#include "components/webdata/common/web_database_table.h"
diff --git a/components/payments/content/BUILD.gn b/components/payments/content/BUILD.gn
index a200799..ac16b7b5 100644
--- a/components/payments/content/BUILD.gn
+++ b/components/payments/content/BUILD.gn
@@ -2,8 +2,6 @@
# 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 = [
"payment_request.cc",
@@ -20,44 +18,16 @@
]
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",
- ]
-}
-
static_library("utils") {
sources = [
"payment_details_validation.cc",
@@ -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",
diff --git a/components/payments/content/android/BUILD.gn b/components/payments/content/android/BUILD.gn
index 609224f14..46d2578 100644
--- a/components/payments/content/android/BUILD.gn
+++ b/components/payments/content/android/BUILD.gn
@@ -22,9 +22,9 @@
deps = [
":jni_headers",
"//base",
- "//components/payments/content:mojom",
"//components/payments/content:utils",
"//components/payments/core",
+ "//components/payments/mojom",
"//content/public/browser",
"//net",
]
@@ -49,8 +49,8 @@
]
deps = [
"//base:base_java",
- "//components/payments/content:mojom_java",
- "//components/payments/content:mojom_parser_java",
+ "//components/payments/mojom:mojom_java",
+ "//components/payments/mojom:mojom_parser_java",
"//content/public/android:content_java",
"//mojo/public/java:bindings_java",
]
diff --git a/components/payments/content/android/payment_details_validation_android.cc b/components/payments/content/android/payment_details_validation_android.cc
index ddc7ffc..fa88d63 100644
--- a/components/payments/content/android/payment_details_validation_android.cc
+++ b/components/payments/content/android/payment_details_validation_android.cc
@@ -13,7 +13,7 @@
#include "base/android/jni_android.h"
#include "components/payments/content/payment_details_validation.h"
-#include "components/payments/content/payment_request.mojom.h"
+#include "components/payments/mojom/payment_request.mojom.h"
#include "jni/PaymentValidator_jni.h"
namespace payments {
diff --git a/components/payments/content/payment_details_validation.cc b/components/payments/content/payment_details_validation.cc
index 351e82c..c894459 100644
--- a/components/payments/content/payment_details_validation.cc
+++ b/components/payments/content/payment_details_validation.cc
@@ -7,8 +7,8 @@
#include <set>
#include <vector>
-#include "components/payments/content/payment_request.mojom.h"
#include "components/payments/content/payments_validators.h"
+#include "components/payments/mojom/payment_request.mojom.h"
namespace payments {
namespace {
diff --git a/components/payments/content/payment_details_validation.h b/components/payments/content/payment_details_validation.h
index e623087..fda9990 100644
--- a/components/payments/content/payment_details_validation.h
+++ b/components/payments/content/payment_details_validation.h
@@ -7,7 +7,7 @@
#include <string>
-#include "components/payments/content/payment_request.mojom.h"
+#include "components/payments/mojom/payment_request.mojom.h"
namespace payments {
diff --git a/components/payments/content/payment_manifest_parser_host.h b/components/payments/content/payment_manifest_parser_host.h
index 2873bdf6..eb68875 100644
--- a/components/payments/content/payment_manifest_parser_host.h
+++ b/components/payments/content/payment_manifest_parser_host.h
@@ -13,7 +13,7 @@
#include "base/callback_forward.h"
#include "base/macros.h"
-#include "components/payments/content/payment_manifest_parser.mojom.h"
+#include "components/payments/mojom/payment_manifest_parser.mojom.h"
#include "url/gurl.h"
namespace content {
diff --git a/components/payments/content/payment_request.h b/components/payments/content/payment_request.h
index ad2abed..d609c83 100644
--- a/components/payments/content/payment_request.h
+++ b/components/payments/content/payment_request.h
@@ -9,10 +9,10 @@
#include <vector>
#include "base/macros.h"
-#include "components/payments/content/payment_request.mojom.h"
#include "components/payments/content/payment_request_spec.h"
#include "components/payments/content/payment_request_state.h"
#include "components/payments/core/payment_request_delegate.h"
+#include "components/payments/mojom/payment_request.mojom.h"
#include "mojo/public/cpp/bindings/binding.h"
#include "mojo/public/cpp/bindings/interface_request.h"
diff --git a/components/payments/content/payment_request_spec.h b/components/payments/content/payment_request_spec.h
index de0187a..5d9273b 100644
--- a/components/payments/content/payment_request_spec.h
+++ b/components/payments/content/payment_request_spec.h
@@ -11,9 +11,9 @@
#include "base/macros.h"
#include "base/observer_list.h"
-#include "components/payments/content/payment_request.mojom.h"
#include "components/payments/core/currency_formatter.h"
#include "components/payments/core/payment_options_provider.h"
+#include "components/payments/mojom/payment_request.mojom.h"
namespace payments {
diff --git a/components/payments/content/payment_request_spec_unittest.cc b/components/payments/content/payment_request_spec_unittest.cc
index a90d1e4..f9f2a86f 100644
--- a/components/payments/content/payment_request_spec_unittest.cc
+++ b/components/payments/content/payment_request_spec_unittest.cc
@@ -7,7 +7,7 @@
#include <utility>
#include "base/memory/weak_ptr.h"
-#include "components/payments/content/payment_request.mojom.h"
+#include "components/payments/mojom/payment_request.mojom.h"
#include "testing/gtest/include/gtest/gtest.h"
namespace payments {
diff --git a/components/payments/content/payment_request_state.h b/components/payments/content/payment_request_state.h
index cb0b2a9..dcef090b 100644
--- a/components/payments/content/payment_request_state.h
+++ b/components/payments/content/payment_request_state.h
@@ -11,8 +11,8 @@
#include "base/macros.h"
#include "base/observer_list.h"
-#include "components/payments/content/payment_request.mojom.h"
#include "components/payments/content/payment_response_helper.h"
+#include "components/payments/mojom/payment_request.mojom.h"
namespace i18n {
namespace addressinput {
diff --git a/components/payments/content/payment_request_state_unittest.cc b/components/payments/content/payment_request_state_unittest.cc
index 8509777..6b18b17 100644
--- a/components/payments/content/payment_request_state_unittest.cc
+++ b/components/payments/content/payment_request_state_unittest.cc
@@ -12,8 +12,8 @@
#include "components/autofill/core/browser/autofill_test_utils.h"
#include "components/autofill/core/browser/credit_card.h"
#include "components/autofill/core/browser/test_personal_data_manager.h"
-#include "components/payments/content/payment_request.mojom.h"
#include "components/payments/content/payment_request_spec.h"
+#include "components/payments/mojom/payment_request.mojom.h"
#include "testing/gtest/include/gtest/gtest.h"
namespace payments {
diff --git a/components/payments/content/payment_request_web_contents_manager.h b/components/payments/content/payment_request_web_contents_manager.h
index 0843358..be08a3d 100644
--- a/components/payments/content/payment_request_web_contents_manager.h
+++ b/components/payments/content/payment_request_web_contents_manager.h
@@ -10,7 +10,7 @@
#include "base/macros.h"
#include "components/payments/content/payment_request.h"
-#include "components/payments/content/payment_request.mojom.h"
+#include "components/payments/mojom/payment_request.mojom.h"
#include "content/public/browser/web_contents_user_data.h"
#include "mojo/public/cpp/bindings/binding.h"
diff --git a/components/payments/content/payment_response_helper.h b/components/payments/content/payment_response_helper.h
index c8903e2..69e0383 100644
--- a/components/payments/content/payment_response_helper.h
+++ b/components/payments/content/payment_response_helper.h
@@ -6,8 +6,8 @@
#define COMPONENTS_PAYMENTS_CONTENT_PAYMENT_RESPONSE_HELPER_H_
#include "base/macros.h"
-#include "components/payments/content/payment_request.mojom.h"
#include "components/payments/core/payment_instrument.h"
+#include "components/payments/mojom/payment_request.mojom.h"
namespace autofill {
class AutofillProfile;
diff --git a/components/payments/content/payment_response_helper_unittest.cc b/components/payments/content/payment_response_helper_unittest.cc
index 7f63b66..efbe6f3 100644
--- a/components/payments/content/payment_response_helper_unittest.cc
+++ b/components/payments/content/payment_response_helper_unittest.cc
@@ -15,10 +15,10 @@
#include "components/autofill/core/browser/autofill_test_utils.h"
#include "components/autofill/core/browser/credit_card.h"
#include "components/autofill/core/browser/test_personal_data_manager.h"
-#include "components/payments/content/payment_request.mojom.h"
#include "components/payments/content/payment_request_spec.h"
#include "components/payments/core/autofill_payment_instrument.h"
#include "components/payments/core/payment_request_delegate.h"
+#include "components/payments/mojom/payment_request.mojom.h"
#include "testing/gtest/include/gtest/gtest.h"
namespace payments {
diff --git a/components/payments/content/payments_validators.h b/components/payments/content/payments_validators.h
index 135074cc..33af759 100644
--- a/components/payments/content/payments_validators.h
+++ b/components/payments/content/payments_validators.h
@@ -8,7 +8,7 @@
#include <string>
#include "base/macros.h"
-#include "components/payments/content/payment_request.mojom.h"
+#include "components/payments/mojom/payment_request.mojom.h"
namespace payments {
diff --git a/components/payments/content/utility/BUILD.gn b/components/payments/content/utility/BUILD.gn
index 643a1b64..d202928 100644
--- a/components/payments/content/utility/BUILD.gn
+++ b/components/payments/content/utility/BUILD.gn
@@ -11,7 +11,7 @@
]
deps = [
"//base",
- "//components/payments/content:mojom_parser",
+ "//components/payments/mojom:mojom_parser",
"//url",
]
}
diff --git a/components/payments/content/utility/payment_manifest_parser.h b/components/payments/content/utility/payment_manifest_parser.h
index 3e74394..5f0fbe8b 100644
--- a/components/payments/content/utility/payment_manifest_parser.h
+++ b/components/payments/content/utility/payment_manifest_parser.h
@@ -9,7 +9,7 @@
#include <vector>
#include "base/macros.h"
-#include "components/payments/content/payment_manifest_parser.mojom.h"
+#include "components/payments/mojom/payment_manifest_parser.mojom.h"
#include "url/gurl.h"
namespace payments {
diff --git a/components/payments/mojom/BUILD.gn b/components/payments/mojom/BUILD.gn
new file mode 100644
index 0000000..9268a07
--- /dev/null
+++ b/components/payments/mojom/BUILD.gn
@@ -0,0 +1,33 @@
+# 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.
+
+import("//mojo/public/tools/bindings/mojom.gni")
+
+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",
+ ]
+}
diff --git a/components/payments/content/OWNERS b/components/payments/mojom/OWNERS
similarity index 100%
rename from components/payments/content/OWNERS
rename to components/payments/mojom/OWNERS
diff --git a/components/payments/content/payment_app.mojom b/components/payments/mojom/payment_app.mojom
similarity index 95%
rename from components/payments/content/payment_app.mojom
rename to components/payments/mojom/payment_app.mojom
index a980ddc..f7eae0a4 100644
--- a/components/payments/content/payment_app.mojom
+++ b/components/payments/mojom/payment_app.mojom
@@ -4,7 +4,7 @@
module payments.mojom;
-import "components/payments/content/payment_request.mojom";
+import "components/payments/mojom/payment_request.mojom";
import "mojo/common/time.mojom";
import "url/mojo/url.mojom";
diff --git a/components/payments/content/payment_manifest_parser.mojom b/components/payments/mojom/payment_manifest_parser.mojom
similarity index 100%
rename from components/payments/content/payment_manifest_parser.mojom
rename to components/payments/mojom/payment_manifest_parser.mojom
diff --git a/components/payments/content/payment_request.mojom b/components/payments/mojom/payment_request.mojom
similarity index 100%
rename from components/payments/content/payment_request.mojom
rename to components/payments/mojom/payment_request.mojom
diff --git a/content/browser/BUILD.gn b/content/browser/BUILD.gn
index 75dd323..580a9d28 100644
--- a/content/browser/BUILD.gn
+++ b/content/browser/BUILD.gn
@@ -44,7 +44,7 @@
"//components/leveldb:lib",
"//components/link_header_util",
"//components/mime_util",
- "//components/payments/content:mojom_payment_app",
+ "//components/payments/mojom:mojom_payment_app",
"//components/rappor",
"//components/tracing",
"//components/tracing:startup_tracing",
diff --git a/content/browser/payments/payment_app_browsertest.cc b/content/browser/payments/payment_app_browsertest.cc
index 9f840a0..e6183f0 100644
--- a/content/browser/payments/payment_app_browsertest.cc
+++ b/content/browser/payments/payment_app_browsertest.cc
@@ -5,7 +5,7 @@
#include "base/command_line.h"
#include "base/macros.h"
#include "base/run_loop.h"
-#include "components/payments/content/payment_app.mojom.h"
+#include "components/payments/mojom/payment_app.mojom.h"
#include "content/public/browser/payment_app_provider.h"
#include "content/public/browser/web_contents.h"
#include "content/public/common/content_switches.h"
diff --git a/content/browser/payments/payment_app_content_unittest_base.h b/content/browser/payments/payment_app_content_unittest_base.h
index 9461e5f..7a63fec 100644
--- a/content/browser/payments/payment_app_content_unittest_base.h
+++ b/content/browser/payments/payment_app_content_unittest_base.h
@@ -11,7 +11,7 @@
#include "base/macros.h"
#include "base/memory/ref_counted.h"
-#include "components/payments/content/payment_app.mojom.h"
+#include "components/payments/mojom/payment_app.mojom.h"
#include "content/browser/payments/payment_manager.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "url/gurl.h"
diff --git a/content/browser/payments/payment_app_context_impl.h b/content/browser/payments/payment_app_context_impl.h
index 2b9aa8f..259b53da 100644
--- a/content/browser/payments/payment_app_context_impl.h
+++ b/content/browser/payments/payment_app_context_impl.h
@@ -10,7 +10,7 @@
#include "base/macros.h"
#include "base/memory/ref_counted.h"
-#include "components/payments/content/payment_app.mojom.h"
+#include "components/payments/mojom/payment_app.mojom.h"
#include "content/browser/payments/payment_app_database.h"
#include "content/common/content_export.h"
diff --git a/content/browser/payments/payment_app_database.h b/content/browser/payments/payment_app_database.h
index 8e83b60..2e6ec55 100644
--- a/content/browser/payments/payment_app_database.h
+++ b/content/browser/payments/payment_app_database.h
@@ -10,7 +10,7 @@
#include "base/macros.h"
#include "base/memory/weak_ptr.h"
-#include "components/payments/content/payment_app.mojom.h"
+#include "components/payments/mojom/payment_app.mojom.h"
#include "content/browser/service_worker/service_worker_context_wrapper.h"
#include "content/browser/service_worker/service_worker_registration.h"
#include "content/common/content_export.h"
diff --git a/content/browser/payments/payment_app_provider_impl_unittest.cc b/content/browser/payments/payment_app_provider_impl_unittest.cc
index 1872cc8..83be68b4 100644
--- a/content/browser/payments/payment_app_provider_impl_unittest.cc
+++ b/content/browser/payments/payment_app_provider_impl_unittest.cc
@@ -8,7 +8,7 @@
#include "base/macros.h"
#include "base/run_loop.h"
-#include "components/payments/content/payment_app.mojom.h"
+#include "components/payments/mojom/payment_app.mojom.h"
#include "content/browser/payments/payment_app_content_unittest_base.h"
#include "content/browser/payments/payment_app_provider_impl.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/content/browser/payments/payment_manager.h b/content/browser/payments/payment_manager.h
index 6872ad2..496e8ee 100644
--- a/content/browser/payments/payment_manager.h
+++ b/content/browser/payments/payment_manager.h
@@ -9,7 +9,7 @@
#include "base/macros.h"
#include "base/memory/weak_ptr.h"
-#include "components/payments/content/payment_app.mojom.h"
+#include "components/payments/mojom/payment_app.mojom.h"
#include "content/common/content_export.h"
#include "mojo/public/cpp/bindings/binding.h"
#include "url/gurl.h"
diff --git a/content/browser/payments/payment_manager_unittest.cc b/content/browser/payments/payment_manager_unittest.cc
index ebed2ae..fd01718b 100644
--- a/content/browser/payments/payment_manager_unittest.cc
+++ b/content/browser/payments/payment_manager_unittest.cc
@@ -5,7 +5,7 @@
#include <utility>
#include "base/macros.h"
-#include "components/payments/content/payment_app.mojom.h"
+#include "components/payments/mojom/payment_app.mojom.h"
#include "content/browser/payments/payment_app_content_unittest_base.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "url/gurl.h"
diff --git a/content/common/BUILD.gn b/content/common/BUILD.gn
index fd5c0dc..bf9aca2 100644
--- a/content/common/BUILD.gn
+++ b/content/common/BUILD.gn
@@ -614,7 +614,7 @@
public_deps = [
"//components/leveldb/public/interfaces",
- "//components/payments/content:mojom_payment_app",
+ "//components/payments/mojom:mojom_payment_app",
"//content/public/common:interfaces",
# TODO(mcasas): remove the following dep after https://crbug.com/653994
diff --git a/content/common/service_worker/service_worker_event_dispatcher.mojom b/content/common/service_worker/service_worker_event_dispatcher.mojom
index 2f309bb3..42d1218c 100644
--- a/content/common/service_worker/service_worker_event_dispatcher.mojom
+++ b/content/common/service_worker/service_worker_event_dispatcher.mojom
@@ -4,7 +4,7 @@
module content.mojom;
-import "components/payments/content/payment_app.mojom";
+import "components/payments/mojom/payment_app.mojom";
import "content/common/url_loader.mojom";
import "mojo/common/string16.mojom";
import "mojo/common/time.mojom";
diff --git a/content/public/browser/DEPS b/content/public/browser/DEPS
index ec5000d..e779c4c 100644
--- a/content/public/browser/DEPS
+++ b/content/public/browser/DEPS
@@ -1,5 +1,5 @@
include_rules = [
- "+components/payments/content/payment_app.mojom.h",
+ "+components/payments/mojom/payment_app.mojom.h",
"+device/screen_orientation/public/interfaces",
]
diff --git a/content/public/browser/payment_app_provider.h b/content/public/browser/payment_app_provider.h
index 646c3d1..9a86d01 100644
--- a/content/public/browser/payment_app_provider.h
+++ b/content/public/browser/payment_app_provider.h
@@ -10,7 +10,7 @@
#include <vector>
#include "base/callback_forward.h"
-#include "components/payments/content/payment_app.mojom.h"
+#include "components/payments/mojom/payment_app.mojom.h"
#include "content/common/content_export.h"
namespace content {
diff --git a/content/renderer/BUILD.gn b/content/renderer/BUILD.gn
index 54ac85e2..9d95d274 100644
--- a/content/renderer/BUILD.gn
+++ b/content/renderer/BUILD.gn
@@ -432,7 +432,7 @@
"//cc/surfaces:surface_id",
"//cc/surfaces:surfaces",
"//components/discardable_memory/client",
- "//components/payments/content:mojom_payment_app",
+ "//components/payments/mojom:mojom_payment_app",
"//components/url_formatter",
"//components/variations",
"//content:resources",
diff --git a/content/renderer/service_worker/service_worker_context_client.h b/content/renderer/service_worker/service_worker_context_client.h
index 967eaf8..3ec1e59 100644
--- a/content/renderer/service_worker/service_worker_context_client.h
+++ b/content/renderer/service_worker/service_worker_context_client.h
@@ -19,7 +19,7 @@
#include "base/memory/ref_counted.h"
#include "base/strings/string16.h"
#include "base/time/time.h"
-#include "components/payments/content/payment_app.mojom.h"
+#include "components/payments/mojom/payment_app.mojom.h"
#include "content/child/webmessageportchannel_impl.h"
#include "content/common/service_worker/embedded_worker.mojom.h"
#include "content/common/service_worker/service_worker_event_dispatcher.mojom.h"
diff --git a/content/renderer/service_worker/service_worker_type_converters.h b/content/renderer/service_worker/service_worker_type_converters.h
index e5dc1f6..28b5e68a 100644
--- a/content/renderer/service_worker/service_worker_type_converters.h
+++ b/content/renderer/service_worker/service_worker_type_converters.h
@@ -5,7 +5,7 @@
#ifndef CONTENT_RENDERER_SERVICE_WORKER_SERVICE_WORKER_TYPE_CONVERTERS_H_
#define CONTENT_RENDERER_SERVICE_WORKER_SERVICE_WORKER_TYPE_CONVERTERS_H_
-#include "components/payments/content/payment_app.mojom.h"
+#include "components/payments/mojom/payment_app.mojom.h"
#include "content/common/service_worker/service_worker_event_dispatcher.mojom.h"
#include "content/common/service_worker/service_worker_status_code.h"
#include "third_party/WebKit/public/platform/modules/payments/WebPaymentAppRequest.h"
diff --git a/content/test/BUILD.gn b/content/test/BUILD.gn
index 7f302a30..a1ac65f 100644
--- a/content/test/BUILD.gn
+++ b/content/test/BUILD.gn
@@ -239,7 +239,7 @@
"//cc/surfaces",
"//components/display_compositor",
"//components/leveldb/public/interfaces",
- "//components/payments/content:mojom_payment_app",
+ "//components/payments/mojom:mojom_payment_app",
"//content/app:both_for_content_tests",
"//content/browser:for_content_tests",
"//content/browser/speech/proto",
@@ -726,7 +726,7 @@
"//components/discardable_memory/client",
"//components/discardable_memory/common",
"//components/discardable_memory/service",
- "//components/payments/content:mojom_payment_app",
+ "//components/payments/mojom:mojom_payment_app",
"//content:resources",
"//content/app:both_for_content_tests",
"//content/browser:for_content_tests",
@@ -1442,8 +1442,8 @@
"//cc/surfaces",
"//components/display_compositor",
"//components/leveldb/public/cpp",
- "//components/payments/content:mojom",
- "//components/payments/content:mojom_payment_app",
+ "//components/payments/mojom",
+ "//components/payments/mojom:mojom_payment_app",
"//components/rappor:test_support",
"//content:resources",
"//content/app:both_for_content_tests",
diff --git a/third_party/WebKit/LayoutTests/payments/resources/payment-request-mock.js b/third_party/WebKit/LayoutTests/payments/resources/payment-request-mock.js
index dce8a0a..a50b8dd 100644
--- a/third_party/WebKit/LayoutTests/payments/resources/payment-request-mock.js
+++ b/third_party/WebKit/LayoutTests/payments/resources/payment-request-mock.js
@@ -6,7 +6,7 @@
let paymentRequestMock = loadMojoModules(
'paymentRequestMock',
- ['components/payments/content/payment_request.mojom',
+ ['components/payments/mojom/payment_request.mojom',
'mojo/public/js/bindings',
]).then(mojo => {
let [paymentRequest, bindings] = mojo.modules;
diff --git a/third_party/WebKit/Source/modules/BUILD.gn b/third_party/WebKit/Source/modules/BUILD.gn
index 15fa267..e42ddf0 100644
--- a/third_party/WebKit/Source/modules/BUILD.gn
+++ b/third_party/WebKit/Source/modules/BUILD.gn
@@ -322,7 +322,7 @@
deps = [
":modules",
":modules_testing",
- "//components/payments/content:mojom_blink",
+ "//components/payments/mojom:mojom_blink",
"//skia",
"//testing/gmock",
"//testing/gtest",
diff --git a/third_party/WebKit/Source/modules/payments/BUILD.gn b/third_party/WebKit/Source/modules/payments/BUILD.gn
index 7379385..09cdb69 100644
--- a/third_party/WebKit/Source/modules/payments/BUILD.gn
+++ b/third_party/WebKit/Source/modules/payments/BUILD.gn
@@ -35,7 +35,7 @@
"PaymentsValidators.h",
]
deps = [
- "//components/payments/content:mojom_blink",
- "//components/payments/content:mojom_payment_app_blink",
+ "//components/payments/mojom:mojom_blink",
+ "//components/payments/mojom:mojom_payment_app_blink",
]
}
diff --git a/third_party/WebKit/Source/modules/payments/PaymentAddress.h b/third_party/WebKit/Source/modules/payments/PaymentAddress.h
index 805e0ba..01f06b37 100644
--- a/third_party/WebKit/Source/modules/payments/PaymentAddress.h
+++ b/third_party/WebKit/Source/modules/payments/PaymentAddress.h
@@ -7,7 +7,7 @@
#include "bindings/core/v8/ScriptValue.h"
#include "bindings/core/v8/ScriptWrappable.h"
-#include "components/payments/content/payment_request.mojom-blink.h"
+#include "components/payments/mojom/payment_request.mojom-blink.h"
#include "modules/ModulesExport.h"
#include "platform/heap/Handle.h"
#include "platform/wtf/Noncopyable.h"
diff --git a/third_party/WebKit/Source/modules/payments/PaymentManager.h b/third_party/WebKit/Source/modules/payments/PaymentManager.h
index 207ad86e..b20a1ff 100644
--- a/third_party/WebKit/Source/modules/payments/PaymentManager.h
+++ b/third_party/WebKit/Source/modules/payments/PaymentManager.h
@@ -7,7 +7,7 @@
#include "bindings/core/v8/ScriptPromise.h"
#include "bindings/core/v8/ScriptWrappable.h"
-#include "components/payments/content/payment_app.mojom-blink.h"
+#include "components/payments/mojom/payment_app.mojom-blink.h"
#include "modules/ModulesExport.h"
#include "platform/heap/Handle.h"
diff --git a/third_party/WebKit/Source/modules/payments/PaymentRequest.h b/third_party/WebKit/Source/modules/payments/PaymentRequest.h
index 63022dc..f3c1319 100644
--- a/third_party/WebKit/Source/modules/payments/PaymentRequest.h
+++ b/third_party/WebKit/Source/modules/payments/PaymentRequest.h
@@ -8,7 +8,7 @@
#include "bindings/core/v8/ScriptPromise.h"
#include "bindings/core/v8/ScriptValue.h"
#include "bindings/core/v8/ScriptWrappable.h"
-#include "components/payments/content/payment_request.mojom-blink.h"
+#include "components/payments/mojom/payment_request.mojom-blink.h"
#include "core/dom/ContextLifecycleObserver.h"
#include "core/events/EventTarget.h"
#include "modules/ModulesExport.h"
diff --git a/third_party/WebKit/Source/modules/payments/PaymentResponse.h b/third_party/WebKit/Source/modules/payments/PaymentResponse.h
index f6de224..f3a713f 100644
--- a/third_party/WebKit/Source/modules/payments/PaymentResponse.h
+++ b/third_party/WebKit/Source/modules/payments/PaymentResponse.h
@@ -8,7 +8,7 @@
#include "bindings/core/v8/ScriptPromise.h"
#include "bindings/core/v8/ScriptValue.h"
#include "bindings/core/v8/ScriptWrappable.h"
-#include "components/payments/content/payment_request.mojom-blink.h"
+#include "components/payments/mojom/payment_request.mojom-blink.h"
#include "modules/ModulesExport.h"
#include "modules/payments/PaymentCurrencyAmount.h"
#include "platform/heap/Handle.h"
diff --git a/third_party/WebKit/Source/modules/payments/PaymentTestHelper.h b/third_party/WebKit/Source/modules/payments/PaymentTestHelper.h
index 9d9d7aa..19683ee 100644
--- a/third_party/WebKit/Source/modules/payments/PaymentTestHelper.h
+++ b/third_party/WebKit/Source/modules/payments/PaymentTestHelper.h
@@ -7,7 +7,7 @@
#include "bindings/core/v8/ScriptFunction.h"
#include "bindings/core/v8/V8DOMException.h"
-#include "components/payments/content/payment_request.mojom-blink.h"
+#include "components/payments/mojom/payment_request.mojom-blink.h"
#include "modules/payments/PaymentDetailsInit.h"
#include "modules/payments/PaymentDetailsUpdate.h"
#include "modules/payments/PaymentItem.h"
diff --git a/third_party/WebKit/Source/modules/payments/PaymentsValidators.h b/third_party/WebKit/Source/modules/payments/PaymentsValidators.h
index 177fde0..c391a1e 100644
--- a/third_party/WebKit/Source/modules/payments/PaymentsValidators.h
+++ b/third_party/WebKit/Source/modules/payments/PaymentsValidators.h
@@ -5,7 +5,7 @@
#ifndef PaymentsValidators_h
#define PaymentsValidators_h
-#include "components/payments/content/payment_request.mojom-blink.h"
+#include "components/payments/mojom/payment_request.mojom-blink.h"
#include "modules/ModulesExport.h"
#include "platform/wtf/Allocator.h"
#include "platform/wtf/text/WTFString.h"
diff --git a/third_party/WebKit/public/BUILD.gn b/third_party/WebKit/public/BUILD.gn
index d54758b..5c99374 100644
--- a/third_party/WebKit/public/BUILD.gn
+++ b/third_party/WebKit/public/BUILD.gn
@@ -754,7 +754,7 @@
"platform/modules/webshare/webshare.mojom",
]
public_deps = [
- "//components/payments/content:mojom",
+ "//components/payments/mojom",
"//url/mojo:url_mojom_gurl",
]