[WebLayer] Move PaymentManifestWebdataServiceAndroid into //chrome

Before:
Compiling //components' PaymentManifestWebdataServiceAndroid in
//weblayer would fail because it depends on //chrome's
payment_manifest_webdata_service_android.

Changes:
Move //components' PaymentManifestWebdataServiceAndroid into //chrome.

After:
PaymentManifestWebdataServiceAndroid lives in //chrome and wouldn't
be compiled when //weblayer compile //components payment targets.
Going forwards, PaymentManifestWebdataService will only be used in
Chrome payment, WebLayer payment will find a replacement for it.

Bug: 1140637

Change-Id: I4a07761c5220c930cf3c0abd05d9072b63179693
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2488548Reviewed-by: Rouslan Solomakhin <rouslan@chromium.org>
Reviewed-by: Andrew Grieve <agrieve@chromium.org>
Commit-Queue: Liquan (Max) Gu <maxlg@chromium.org>
Cr-Commit-Position: refs/heads/master@{#820121}

chrome/android/chrome_java_sources.gni

@@ -1271,6 +1271,7 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/payments/PaymentAppService.java",
   "java/src/org/chromium/chrome/browser/payments/PaymentAppServiceBridge.java",
   "java/src/org/chromium/chrome/browser/payments/PaymentManifestVerifier.java",
+  "java/src/org/chromium/chrome/browser/payments/PaymentManifestWebDataService.java",
   "java/src/org/chromium/chrome/browser/payments/PaymentPreferencesUtil.java",
   "java/src/org/chromium/chrome/browser/payments/PaymentResponseHelper.java",
   "java/src/org/chromium/chrome/browser/payments/ServiceWorkerPaymentAppBridge.java",

chrome/android/java/src/org/chromium/chrome/browser/payments/AndroidPaymentAppFactory.java

@@ -13,7 +13,6 @@ import android.util.Pair;
 import org.chromium.components.payments.PackageManagerDelegate;
 import org.chromium.components.payments.PaymentManifestDownloader;
 import org.chromium.components.payments.PaymentManifestParser;
-import org.chromium.components.payments.PaymentManifestWebDataService;
 import org.chromium.components.payments.intent.WebPaymentIntentHelper;
 
 import java.util.HashMap;

chrome/android/java/src/org/chromium/chrome/browser/payments/AndroidPaymentAppFinder.java

@@ -22,7 +22,6 @@ import org.chromium.components.payments.PackageManagerDelegate;
 import org.chromium.components.payments.PaymentFeatureList;
 import org.chromium.components.payments.PaymentManifestDownloader;
 import org.chromium.components.payments.PaymentManifestParser;
-import org.chromium.components.payments.PaymentManifestWebDataService;
 import org.chromium.components.payments.PaymentOptionsUtils;
 import org.chromium.components.payments.SupportedDelegations;
 import org.chromium.components.payments.intent.WebPaymentIntentHelper;

chrome/android/java/src/org/chromium/chrome/browser/payments/PaymentManifestVerifier.java

@@ -16,7 +16,6 @@ import org.chromium.components.payments.PaymentManifestDownloader;
 import org.chromium.components.payments.PaymentManifestDownloader.ManifestDownloadCallback;
 import org.chromium.components.payments.PaymentManifestParser;
 import org.chromium.components.payments.PaymentManifestParser.ManifestParseCallback;
-import org.chromium.components.payments.PaymentManifestWebDataService;
 import org.chromium.components.payments.WebAppManifestSection;
 import org.chromium.url.GURL;
 import org.chromium.url.Origin;

components/payments/content/android/java/src/org/chromium/components/payments/PaymentManifestWebDataService.java → chrome/android/java/src/org/chromium/chrome/browser/payments/PaymentManifestWebDataService.java

@@ -2,11 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-package org.chromium.components.payments;
+package org.chromium.chrome.browser.payments;
 
 import org.chromium.base.annotations.CalledByNative;
 import org.chromium.base.annotations.JNINamespace;
 import org.chromium.base.annotations.NativeMethods;
+import org.chromium.components.payments.WebAppManifestSection;
 
 /** Java wrapper of the payment manifest web data service. */
 @JNINamespace("payments")

chrome/android/javatests/src/org/chromium/chrome/browser/payments/AndroidPaymentAppFinderTest.java

@@ -27,7 +27,6 @@ import org.chromium.components.payments.PaymentAppFactoryParams;
 import org.chromium.components.payments.PaymentFeatureList;
 import org.chromium.components.payments.PaymentManifestDownloader;
 import org.chromium.components.payments.PaymentManifestParser;
-import org.chromium.components.payments.PaymentManifestWebDataService;
 import org.chromium.content_public.browser.RenderFrameHost;
 import org.chromium.content_public.browser.WebContents;
 import org.chromium.content_public.browser.test.util.CriteriaHelper;

chrome/android/javatests/src/org/chromium/chrome/browser/payments/AndroidPaymentAppFinderUnitTest.java

@@ -34,7 +34,6 @@ import org.chromium.components.payments.PaymentApp;
 import org.chromium.components.payments.PaymentAppFactoryParams;
 import org.chromium.components.payments.PaymentManifestDownloader;
 import org.chromium.components.payments.PaymentManifestParser;
-import org.chromium.components.payments.PaymentManifestWebDataService;
 import org.chromium.components.payments.WebAppManifestSection;
 import org.chromium.content_public.browser.WebContents;
 import org.chromium.content_public.browser.test.NativeLibraryTestUtils;

chrome/android/javatests/src/org/chromium/chrome/browser/payments/PaymentManifestVerifierTest.java

@@ -23,12 +23,11 @@ import org.mockito.MockitoAnnotations;
 import org.chromium.base.test.BaseJUnit4ClassRunner;
 import org.chromium.base.test.util.Batch;
 import org.chromium.chrome.browser.payments.PaymentManifestVerifier.ManifestVerifyCallback;
+import org.chromium.chrome.browser.payments.PaymentManifestWebDataService.PaymentManifestWebDataServiceCallback;
 import org.chromium.chrome.test.ChromeBrowserTestRule;
 import org.chromium.components.payments.PackageManagerDelegate;
 import org.chromium.components.payments.PaymentManifestDownloader;
 import org.chromium.components.payments.PaymentManifestParser;
-import org.chromium.components.payments.PaymentManifestWebDataService;
-import org.chromium.components.payments.PaymentManifestWebDataService.PaymentManifestWebDataServiceCallback;
 import org.chromium.components.payments.WebAppManifestSection;
 import org.chromium.content_public.browser.WebContents;
 import org.chromium.content_public.browser.test.NativeLibraryTestUtils;

chrome/browser/payments/android/BUILD.gn

@@ -11,6 +11,7 @@ import("//build/config/android/rules.gni")
 generate_jni("jni_headers") {
   sources = [
     "../../../android/java/src/org/chromium/chrome/browser/payments/PaymentAppServiceBridge.java",
+    "../../../android/java/src/org/chromium/chrome/browser/payments/PaymentManifestWebDataService.java",
     "../../../android/java/src/org/chromium/chrome/browser/payments/ServiceWorkerPaymentAppBridge.java",
     "../../../android/java/src/org/chromium/chrome/browser/payments/SslValidityChecker.java",
   ]

chrome/browser/payments/android/payment_manifest_web_data_service_android.cc

@@ -11,10 +11,10 @@
 #include "base/check_op.h"
 #include "base/notreached.h"
 #include "base/numerics/safe_conversions.h"
+#include "chrome/browser/payments/android/jni_headers/PaymentManifestWebDataService_jni.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/web_data_service_factory.h"
 #include "components/keyed_service/core/service_access_type.h"
-#include "components/payments/content/android/jni_headers/PaymentManifestWebDataService_jni.h"
 #include "components/webdata/common/web_data_results.h"
 
 namespace payments {

components/payments/content/android/BUILD.gn

@@ -63,7 +63,6 @@ generate_jni("jni_headers") {
     "java/src/org/chromium/components/payments/PaymentHandlerHost.java",
     "java/src/org/chromium/components/payments/PaymentManifestDownloader.java",
     "java/src/org/chromium/components/payments/PaymentManifestParser.java",
-    "java/src/org/chromium/components/payments/PaymentManifestWebDataService.java",
     "java/src/org/chromium/components/payments/PaymentRequestSpec.java",
     "java/src/org/chromium/components/payments/PaymentRequestUpdateEventListener.java",
     "java/src/org/chromium/components/payments/PaymentValidator.java",
@@ -125,7 +124,6 @@ android_library("all_java") {
     "java/src/org/chromium/components/payments/PaymentHandlerHost.java",
     "java/src/org/chromium/components/payments/PaymentManifestDownloader.java",
     "java/src/org/chromium/components/payments/PaymentManifestParser.java",
-    "java/src/org/chromium/components/payments/PaymentManifestWebDataService.java",
     "java/src/org/chromium/components/payments/PaymentOptionsUtils.java",
     "java/src/org/chromium/components/payments/PaymentRequestLifecycleObserver.java",
     "java/src/org/chromium/components/payments/PaymentRequestParams.java",