Commit 21fa1d83 authored by Liquan (Max) Gu's avatar Liquan (Max) Gu Committed by Commit Bot

[WebLayer] Move PaymentAppService into //components

Changes:
* Moved PaymentAppService,
PaymentAppFactoryDelegate, PaymentAppFactoryInterface into //components.

Note that this CL will break clank in compile time because the GPay
integration depends on the changed classes in this CL. A fix[1] on
clank will be submitted immediately after this CL.

[1] https://chrome-internal-review.googlesource.com/c/clank/internal/apps/+/3358145

Bug: 1098908, 1098911, 1142846

Change-Id: Ie3e05b34e5ceb42d40fbc3d472c203297d5b7ab3
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2493144
Commit-Queue: Liquan (Max) Gu <maxlg@chromium.org>
Reviewed-by: default avatarRouslan Solomakhin <rouslan@chromium.org>
Cr-Commit-Position: refs/heads/master@{#822811}
parent 8d9baff7
......@@ -1255,9 +1255,6 @@ chrome_java_sources = [
"java/src/org/chromium/chrome/browser/payments/ChromePaymentRequestFactory.java",
"java/src/org/chromium/chrome/browser/payments/ChromePaymentRequestService.java",
"java/src/org/chromium/chrome/browser/payments/ContactEditor.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/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",
......
......@@ -11,6 +11,8 @@ import android.text.TextUtils;
import android.util.Pair;
import org.chromium.components.payments.PackageManagerDelegate;
import org.chromium.components.payments.PaymentAppFactoryDelegate;
import org.chromium.components.payments.PaymentAppFactoryInterface;
import org.chromium.components.payments.PaymentManifestDownloader;
import org.chromium.components.payments.PaymentManifestParser;
import org.chromium.components.payments.intent.WebPaymentIntentHelper;
......
......@@ -19,6 +19,8 @@ import org.chromium.chrome.browser.payments.PaymentManifestVerifier.ManifestVeri
import org.chromium.components.payments.ErrorStrings;
import org.chromium.components.payments.MethodStrings;
import org.chromium.components.payments.PackageManagerDelegate;
import org.chromium.components.payments.PaymentAppFactoryDelegate;
import org.chromium.components.payments.PaymentAppFactoryInterface;
import org.chromium.components.payments.PaymentFeatureList;
import org.chromium.components.payments.PaymentManifestDownloader;
import org.chromium.components.payments.PaymentManifestParser;
......
......@@ -15,6 +15,8 @@ import org.chromium.chrome.browser.autofill.PersonalDataManager.CreditCard;
import org.chromium.components.payments.BasicCardUtils;
import org.chromium.components.payments.MethodStrings;
import org.chromium.components.payments.PaymentApp;
import org.chromium.components.payments.PaymentAppFactoryDelegate;
import org.chromium.components.payments.PaymentAppFactoryInterface;
import org.chromium.components.payments.PaymentAppFactoryParams;
import org.chromium.components.payments.PaymentFeatureList;
import org.chromium.content_public.browser.RenderFrameHost;
......
......@@ -42,7 +42,10 @@ import org.chromium.components.payments.NotShownReason;
import org.chromium.components.payments.PackageManagerDelegate;
import org.chromium.components.payments.PayerData;
import org.chromium.components.payments.PaymentApp;
import org.chromium.components.payments.PaymentAppFactoryDelegate;
import org.chromium.components.payments.PaymentAppFactoryInterface;
import org.chromium.components.payments.PaymentAppFactoryParams;
import org.chromium.components.payments.PaymentAppService;
import org.chromium.components.payments.PaymentAppType;
import org.chromium.components.payments.PaymentDetailsConverter;
import org.chromium.components.payments.PaymentDetailsUpdateServiceHelper;
......
......@@ -10,6 +10,8 @@ import org.chromium.base.ThreadUtils;
import org.chromium.base.annotations.CalledByNative;
import org.chromium.base.annotations.NativeMethods;
import org.chromium.components.payments.PaymentApp;
import org.chromium.components.payments.PaymentAppFactoryDelegate;
import org.chromium.components.payments.PaymentAppFactoryInterface;
import org.chromium.components.payments.PaymentRequestSpec;
import org.chromium.components.url_formatter.UrlFormatter;
import org.chromium.content_public.browser.RenderFrameHost;
......
......@@ -23,6 +23,8 @@ import org.chromium.chrome.test.ChromeJUnit4ClassRunner;
import org.chromium.chrome.test.ChromeTabbedActivityTestRule;
import org.chromium.chrome.test.util.browser.Features;
import org.chromium.components.payments.PaymentApp;
import org.chromium.components.payments.PaymentAppFactoryDelegate;
import org.chromium.components.payments.PaymentAppFactoryInterface;
import org.chromium.components.payments.PaymentAppFactoryParams;
import org.chromium.components.payments.PaymentFeatureList;
import org.chromium.components.payments.PaymentManifestDownloader;
......
......@@ -31,6 +31,7 @@ import org.chromium.base.test.util.Batch;
import org.chromium.chrome.test.ChromeBrowserTestRule;
import org.chromium.components.payments.PackageManagerDelegate;
import org.chromium.components.payments.PaymentApp;
import org.chromium.components.payments.PaymentAppFactoryDelegate;
import org.chromium.components.payments.PaymentAppFactoryParams;
import org.chromium.components.payments.PaymentManifestDownloader;
import org.chromium.components.payments.PaymentManifestParser;
......
......@@ -23,6 +23,9 @@ import org.chromium.chrome.browser.payments.PaymentRequestTestRule.AppSpeed;
import org.chromium.chrome.browser.payments.PaymentRequestTestRule.MainActivityStartCallback;
import org.chromium.chrome.browser.payments.PaymentRequestTestRule.TestPay;
import org.chromium.chrome.test.ChromeJUnit4ClassRunner;
import org.chromium.components.payments.PaymentAppFactoryDelegate;
import org.chromium.components.payments.PaymentAppFactoryInterface;
import org.chromium.components.payments.PaymentAppService;
import org.chromium.ui.test.util.DisableAnimationsTestRule;
import java.util.concurrent.TimeoutException;
......
......@@ -25,6 +25,9 @@ import org.chromium.chrome.browser.autofill.PersonalDataManager.AutofillProfile;
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.PaymentAppFactoryDelegate;
import org.chromium.components.payments.PaymentAppFactoryInterface;
import org.chromium.components.payments.PaymentAppService;
import org.chromium.components.payments.PaymentFeatureList;
import org.chromium.components.payments.SupportedDelegations;
import org.chromium.content_public.browser.WebContents;
......
......@@ -25,6 +25,9 @@ import org.chromium.chrome.browser.autofill.PersonalDataManager.AutofillProfile;
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.PaymentAppFactoryDelegate;
import org.chromium.components.payments.PaymentAppFactoryInterface;
import org.chromium.components.payments.PaymentAppService;
import org.chromium.components.payments.PaymentFeatureList;
import org.chromium.components.payments.SupportedDelegations;
import org.chromium.content_public.browser.WebContents;
......
......@@ -42,6 +42,9 @@ import org.chromium.chrome.test.ChromeTabbedActivityTestRule;
import org.chromium.components.payments.AbortReason;
import org.chromium.components.payments.PayerData;
import org.chromium.components.payments.PaymentApp;
import org.chromium.components.payments.PaymentAppFactoryDelegate;
import org.chromium.components.payments.PaymentAppFactoryInterface;
import org.chromium.components.payments.PaymentAppService;
import org.chromium.components.payments.PaymentFeatureList;
import org.chromium.components.payments.PaymentRequestService;
import org.chromium.components.payments.PaymentRequestService.PaymentRequestServiceObserverForTest;
......
......@@ -120,7 +120,10 @@ android_library("all_java") {
"java/src/org/chromium/components/payments/MojoStructCollection.java",
"java/src/org/chromium/components/payments/OriginSecurityChecker.java",
"java/src/org/chromium/components/payments/PaymentApp.java",
"java/src/org/chromium/components/payments/PaymentAppFactoryDelegate.java",
"java/src/org/chromium/components/payments/PaymentAppFactoryInterface.java",
"java/src/org/chromium/components/payments/PaymentAppFactoryParams.java",
"java/src/org/chromium/components/payments/PaymentAppService.java",
"java/src/org/chromium/components/payments/PaymentDetailsConverter.java",
"java/src/org/chromium/components/payments/PaymentHandlerHost.java",
"java/src/org/chromium/components/payments/PaymentManifestDownloader.java",
......
......@@ -2,10 +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;
import org.chromium.components.payments.PaymentApp;
import org.chromium.components.payments.PaymentAppFactoryParams;
package org.chromium.components.payments;
/**
* Interface for providing information to a payment app factory and receiving the list of payment
......
......@@ -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;
/** Interface for factories that create payment apps. */
public interface PaymentAppFactoryInterface {
......
......@@ -2,13 +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.VisibleForTesting;
import org.chromium.components.payments.PaymentApp;
import org.chromium.components.payments.PaymentAppFactoryParams;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
......@@ -31,15 +28,6 @@ public class PaymentAppService implements PaymentAppFactoryInterface {
return sInstance;
}
// TODO(crbug.com/1142846): remove this method after we change to use getInstance() to add
// GooglePayPaymentFactory.
@VisibleForTesting
public static PaymentAppService getInstanceWithoutFactoryForTest() {
if (sInstance == null) sInstance = new PaymentAppService();
return sInstance;
}
/** Prevent instantiation. */
private PaymentAppService() {}
// TODO(crbug.com/1142846): Remove this method after tests and clank switch to use
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment