Reland of [Payments] move //components/payments/content/*.mojom files to //components/payments/mojom (patchset #1 id:1 of https://codereview.chromium.org/2823823002/ )
Reason for revert:
The reason appears to have been a synchronization issue with the official builds. Undoing the revert.
Original issue's description:
> Revert of [Payments] move //components/payments/content/*.mojom files to //components/payments/mojom (patchset #7 id:200001 of https://codereview.chromium.org/2811593009/ )
>
> Reason for revert:
> I suspect this caused build failures: crbug.com/712120
>
> Original issue's description:
> > 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}
> > Committed: https://chromium.googlesource.com/chromium/src/+/7ea59a953395e7a90ba8dce7f908cd06a69f180f
>
> [email protected],[email protected],[email protected],[email protected]
> # Skipping CQ checks because original CL landed less than 1 days ago.
> NOPRESUBMIT=true
> NOTREECHECKS=true
> NOTRY=true
> BUG=711952
>
> Review-Url: https://codereview.chromium.org/2823823002
> Cr-Commit-Position: refs/heads/master@{#464910}
> Committed: https://chromium.googlesource.com/chromium/src/+/6ab92fb52c0b4e0fcb4dc9746e05189dc49b748b
[email protected],[email protected],[email protected],[email protected]
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=711952
Review-Url: https://codereview.chromium.org/2822973002
Cr-Commit-Position: refs/heads/master@{#464918}
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;
