[PRImpl] Move classes into components

In order to share the PRImpl logic for WebLayer, the class dependencies
of PRImpl should be moved into //components. The moved classes
include:
* PaymentAppFactoryParams
* PaymentManifestWebDataService
* SslValidityChecker
* SupportedDelegations

Bug: 1102522

Change-Id: I9d2732b547a4532a9cb88104bca51b544d675613
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2307812
Commit-Queue: Liquan (Max) Gu <maxlg@chromium.org>
Reviewed-by: Sahel Sharify <sahel@chromium.org>
Cr-Commit-Position: refs/heads/master@{#790252}

chrome/android/chrome_java_sources.gni

@@ -1247,11 +1247,9 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/payments/PaymentAppComparator.java",
   "java/src/org/chromium/chrome/browser/payments/PaymentAppFactoryDelegate.java",
   "java/src/org/chromium/chrome/browser/payments/PaymentAppFactoryInterface.java",
-  "java/src/org/chromium/chrome/browser/payments/PaymentAppFactoryParams.java",
   "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/PaymentRequestFactory.java",
   "java/src/org/chromium/chrome/browser/payments/PaymentRequestImpl.java",
@@ -1260,8 +1258,6 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/payments/SettingsAutofillAndPaymentsObserver.java",
   "java/src/org/chromium/chrome/browser/payments/ShippingStrings.java",
   "java/src/org/chromium/chrome/browser/payments/SkipToGPayHelper.java",
-  "java/src/org/chromium/chrome/browser/payments/SslValidityChecker.java",
-  "java/src/org/chromium/chrome/browser/payments/SupportedDelegations.java",
   "java/src/org/chromium/chrome/browser/payments/TwaPackageManagerDelegate.java",
   "java/src/org/chromium/chrome/browser/payments/UrlUtils.java",
   "java/src/org/chromium/chrome/browser/payments/WebPaymentIntentHelperTypeConverter.java",

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

@@ -23,6 +23,7 @@ import org.chromium.components.payments.PayerData;
 import org.chromium.components.payments.PaymentApp;
 import org.chromium.components.payments.PaymentAppType;
 import org.chromium.components.payments.PaymentDetailsUpdateServiceHelper;
+import org.chromium.components.payments.SupportedDelegations;
 import org.chromium.components.payments.intent.IsReadyToPayServiceHelper;
 import org.chromium.components.payments.intent.WebPaymentIntentHelper;
 import org.chromium.components.payments.intent.WebPaymentIntentHelperType;

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

@@ -13,6 +13,7 @@ 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,6 +22,8 @@ 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.SupportedDelegations;
 import org.chromium.components.payments.intent.WebPaymentIntentHelper;
 import org.chromium.payments.mojom.PaymentDetailsModifier;
 import org.chromium.payments.mojom.PaymentMethodData;

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

@@ -14,6 +14,7 @@ import org.chromium.chrome.browser.autofill.PersonalDataManager.AutofillProfile;
 import org.chromium.chrome.browser.autofill.PersonalDataManager.CreditCard;
 import org.chromium.components.payments.MethodStrings;
 import org.chromium.components.payments.PaymentApp;
+import org.chromium.components.payments.PaymentAppFactoryParams;
 import org.chromium.components.payments.PaymentFeatureList;
 import org.chromium.content_public.browser.RenderFrameHost;
 import org.chromium.content_public.browser.WebContents;

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

@@ -22,7 +22,6 @@ import org.chromium.chrome.browser.autofill.PersonalDataManager.NormalizedAddres
 import org.chromium.components.payments.ErrorStrings;
 import org.chromium.components.payments.PayerData;
 import org.chromium.components.payments.PaymentApp;
-import org.chromium.components.payments.PaymentApp.InstrumentDetailsCallback;
 import org.chromium.components.payments.PaymentAppType;
 import org.chromium.components.payments.PaymentFeatureList;
 import org.chromium.content_public.browser.WebContents;

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

@@ -5,6 +5,7 @@
 package org.chromium.chrome.browser.payments;
 
 import org.chromium.components.payments.PaymentApp;
+import org.chromium.components.payments.PaymentAppFactoryParams;
 
 /**
  * Interface for providing information to a payment app factory and receiving the list of payment

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

@@ -5,6 +5,7 @@
 package org.chromium.chrome.browser.payments;
 
 import org.chromium.components.payments.PaymentApp;
+import org.chromium.components.payments.PaymentAppFactoryParams;
 
 import java.util.ArrayList;
 import java.util.HashMap;

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

@@ -16,6 +16,7 @@ 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;

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

@@ -15,6 +15,7 @@ import org.chromium.components.payments.ComponentPaymentRequestImpl;
 import org.chromium.components.payments.ErrorStrings;
 import org.chromium.components.payments.OriginSecurityChecker;
 import org.chromium.components.payments.PaymentFeatureList;
+import org.chromium.components.payments.SslValidityChecker;
 import org.chromium.components.user_prefs.UserPrefs;
 import org.chromium.content_public.browser.RenderFrameHost;
 import org.chromium.content_public.browser.WebContents;

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

@@ -70,6 +70,7 @@ import org.chromium.components.payments.OriginSecurityChecker;
 import org.chromium.components.payments.PackageManagerDelegate;
 import org.chromium.components.payments.PayerData;
 import org.chromium.components.payments.PaymentApp;
+import org.chromium.components.payments.PaymentAppFactoryParams;
 import org.chromium.components.payments.PaymentAppType;
 import org.chromium.components.payments.PaymentDetailsConverter;
 import org.chromium.components.payments.PaymentDetailsUpdateServiceHelper;

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

@@ -18,6 +18,7 @@ import org.chromium.chrome.browser.tab.EmptyTabObserver;
 import org.chromium.chrome.browser.tab.Tab;
 import org.chromium.components.payments.PaymentApp;
 import org.chromium.components.payments.PaymentFeatureList;
+import org.chromium.components.payments.SslValidityChecker;
 import org.chromium.content_public.browser.NavigationHandle;
 import org.chromium.content_public.browser.UiThreadTaskTraits;
 import org.chromium.content_public.browser.WebContents;

chrome/android/java/src/org/chromium/chrome/browser/payments/handler/PaymentHandlerMediator.java

@@ -14,7 +14,6 @@ import org.chromium.chrome.browser.compositor.bottombar.OverlayPanel.StateChange
 import org.chromium.chrome.browser.lifecycle.ActivityLifecycleDispatcher;
 import org.chromium.chrome.browser.lifecycle.Destroyable;
 import org.chromium.chrome.browser.payments.ServiceWorkerPaymentAppBridge;
-import org.chromium.chrome.browser.payments.SslValidityChecker;
 import org.chromium.chrome.browser.payments.handler.PaymentHandlerCoordinator.PaymentHandlerUiObserver;
 import org.chromium.chrome.browser.payments.handler.toolbar.PaymentHandlerToolbarCoordinator.PaymentHandlerToolbarObserver;
 import org.chromium.chrome.browser.ui.TabObscuringHandler;
@@ -23,6 +22,7 @@ import org.chromium.components.browser_ui.bottomsheet.BottomSheetController;
 import org.chromium.components.browser_ui.bottomsheet.BottomSheetController.SheetState;
 import org.chromium.components.browser_ui.bottomsheet.BottomSheetObserver;
 import org.chromium.components.browser_ui.widget.scrim.ScrimCoordinator;
+import org.chromium.components.payments.SslValidityChecker;
 import org.chromium.content_public.browser.NavigationController;
 import org.chromium.content_public.browser.NavigationHandle;
 import org.chromium.content_public.browser.WebContents;

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

@@ -23,9 +23,11 @@ import org.chromium.chrome.test.ChromeActivityTestRule;
 import org.chromium.chrome.test.ChromeJUnit4ClassRunner;
 import org.chromium.chrome.test.util.browser.Features;
 import org.chromium.components.payments.PaymentApp;
+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/MockPaymentApp.java

@@ -12,6 +12,7 @@ import androidx.annotation.Nullable;
 import org.chromium.base.task.PostTask;
 import org.chromium.components.payments.PaymentApp;
 import org.chromium.components.payments.PaymentAppType;
+import org.chromium.components.payments.SupportedDelegations;
 import org.chromium.content_public.browser.UiThreadTaskTraits;
 import org.chromium.payments.mojom.PaymentDetailsModifier;
 import org.chromium.payments.mojom.PaymentItem;

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

@@ -26,6 +26,7 @@ import org.chromium.chrome.browser.autofill.PersonalDataManager.CreditCard;
 import org.chromium.chrome.browser.flags.ChromeSwitches;
 import org.chromium.chrome.test.ChromeJUnit4ClassRunner;
 import org.chromium.components.payments.PaymentFeatureList;
+import org.chromium.components.payments.SupportedDelegations;
 import org.chromium.content_public.browser.WebContents;
 import org.chromium.ui.test.util.DisableAnimationsTestRule;
 

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

@@ -26,6 +26,7 @@ import org.chromium.chrome.browser.autofill.PersonalDataManager.CreditCard;
 import org.chromium.chrome.browser.flags.ChromeSwitches;
 import org.chromium.chrome.test.ChromeJUnit4ClassRunner;
 import org.chromium.components.payments.PaymentFeatureList;
+import org.chromium.components.payments.SupportedDelegations;
 import org.chromium.content_public.browser.WebContents;
 import org.chromium.ui.test.util.DisableAnimationsTestRule;
 

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

@@ -21,8 +21,10 @@ import org.chromium.base.annotations.CalledByNative;
 import org.chromium.base.annotations.CalledByNativeJavaTest;
 import org.chromium.components.payments.PackageManagerDelegate;
 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.payments.mojom.PaymentDetailsModifier;

chrome/android/native_java_unittests/src/org/chromium/chrome/browser/payments/AndroidPaymentAppUnitTest.java

@@ -17,6 +17,7 @@ import org.chromium.base.annotations.CalledByNativeJavaTest;
 import org.chromium.chrome.browser.UnitTestUtils;
 import org.chromium.components.payments.PayerData;
 import org.chromium.components.payments.PaymentApp;
+import org.chromium.components.payments.SupportedDelegations;
 import org.chromium.payments.mojom.PaymentCurrencyAmount;
 import org.chromium.payments.mojom.PaymentDetailsModifier;
 import org.chromium.payments.mojom.PaymentItem;

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

@@ -15,10 +15,11 @@ import org.mockito.Mockito;
 import org.chromium.base.annotations.CalledByNative;
 import org.chromium.base.annotations.CalledByNativeJavaTest;
 import org.chromium.chrome.browser.payments.PaymentManifestVerifier.ManifestVerifyCallback;
-import org.chromium.chrome.browser.payments.PaymentManifestWebDataService.PaymentManifestWebDataServiceCallback;
 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.url.GURL;

chrome/browser/payments/android/BUILD.gn

@@ -12,8 +12,6 @@ generate_jni("jni_headers") {
   sources = [
     "../../../android/java/src/org/chromium/chrome/browser/payments/CanMakePaymentQuery.java",
     "../../../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 {

chrome/browser/payments/android/ssl_validity_checker_android.cc

@@ -4,8 +4,8 @@
 
 #include "base/android/jni_string.h"
 #include "base/android/scoped_java_ref.h"
-#include "chrome/browser/payments/android/jni_headers/SslValidityChecker_jni.h"
 #include "chrome/browser/payments/ssl_validity_checker.h"
+#include "components/payments/content/android/jni_headers/SslValidityChecker_jni.h"
 #include "content/public/browser/web_contents.h"
 
 namespace payments {

components/payments/content/android/BUILD.gn

@@ -57,9 +57,11 @@ 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",
+    "java/src/org/chromium/components/payments/SslValidityChecker.java",
     "java/src/org/chromium/components/payments/UrlUtil.java",
   ]
 }
@@ -79,6 +81,7 @@ android_library("java") {
     "java/src/org/chromium/components/payments/PayerData.java",
     "java/src/org/chromium/components/payments/PaymentAddressTypeConverter.java",
     "java/src/org/chromium/components/payments/PaymentApp.java",
+    "java/src/org/chromium/components/payments/PaymentAppFactoryParams.java",
     "java/src/org/chromium/components/payments/PaymentDetailsConverter.java",
     "java/src/org/chromium/components/payments/PaymentDetailsUpdateService.java",
     "java/src/org/chromium/components/payments/PaymentDetailsUpdateServiceHelper.java",
@@ -86,9 +89,12 @@ android_library("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/PaymentRequestSpec.java",
     "java/src/org/chromium/components/payments/PaymentRequestUpdateEventListener.java",
     "java/src/org/chromium/components/payments/PaymentValidator.java",
+    "java/src/org/chromium/components/payments/SslValidityChecker.java",
+    "java/src/org/chromium/components/payments/SupportedDelegations.java",
     "java/src/org/chromium/components/payments/UrlUtil.java",
     "java/src/org/chromium/components/payments/WebAppManifestSection.java",
     "java/src/org/chromium/components/payments/intent/IsReadyToPayServiceHelper.java",

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

@@ -2,12 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-package org.chromium.chrome.browser.payments;
+package org.chromium.components.payments;
 
 import androidx.annotation.Nullable;
 
-import org.chromium.components.payments.PaymentRequestSpec;
-import org.chromium.components.payments.PaymentRequestUpdateEventListener;
 import org.chromium.content_public.browser.RenderFrameHost;
 import org.chromium.content_public.browser.WebContents;
 import org.chromium.payments.mojom.PaymentDetailsModifier;

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

@@ -2,12 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-package org.chromium.chrome.browser.payments;
+package org.chromium.components.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/java/src/org/chromium/chrome/browser/payments/SslValidityChecker.java → components/payments/content/android/java/src/org/chromium/components/payments/SslValidityChecker.java

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-package org.chromium.chrome.browser.payments;
+package org.chromium.components.payments;
 
 import org.chromium.base.annotations.JNINamespace;
 import org.chromium.base.annotations.NativeMethods;

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

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-package org.chromium.chrome.browser.payments;
+package org.chromium.components.payments;
 
 import androidx.annotation.Nullable;
 
@@ -18,14 +18,14 @@ public class SupportedDelegations {
     private final boolean mPayerPhone;
     private final boolean mPayerEmail;
 
-    SupportedDelegations(
+    public SupportedDelegations(
             boolean shippingAddress, boolean payerName, boolean payerPhone, boolean payerEmail) {
         mShippingAddress = shippingAddress;
         mPayerName = payerName;
         mPayerPhone = payerPhone;
         mPayerEmail = payerEmail;
     }
-    SupportedDelegations() {
+    public SupportedDelegations() {
         mShippingAddress = false;
         mPayerName = false;
         mPayerPhone = false;