[WebLayer] Remove WebLayerPaymentRequest flag

Context:
The WebLayerPaymentRequest flag is duplicate in functionality with
the WebPayments flag that is being used to disable PaymentRequest in
WebLayer, e.g.,
out/Debug/bin/run_weblayer_shell --args="--enable-features=WebPayments"

So this CL is to remove the WebLayerPaymentRequest flag.

Bug: 1140798

Change-Id: I55edb3249979f9c1bbe0e0dcc23eb19f6578da0f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2497990
Commit-Queue: Liquan (Max) Gu <maxlg@chromium.org>
Reviewed-by: Scott Violet <sky@chromium.org>
Reviewed-by: Rouslan Solomakhin <rouslan@chromium.org>
Cr-Commit-Position: refs/heads/master@{#820818}

components/payments/content/android/java/src/org/chromium/components/payments/PaymentFeatureList.java

@@ -25,7 +25,6 @@ public class PaymentFeatureList {
     public static final String SERVICE_WORKER_PAYMENT_APPS = "ServiceWorkerPaymentApps";
     public static final String STRICT_HAS_ENROLLED_AUTOFILL_INSTRUMENT =
             "StrictHasEnrolledAutofillInstrument";
-    public static final String WEB_LAYER_PAYMENTS = "WebLayerPayments";
     public static final String WEB_PAYMENTS = "WebPayments";
     public static final String WEB_PAYMENTS_ALWAYS_ALLOW_JUST_IN_TIME_PAYMENT_APP =
             "AlwaysAllowJustInTimePaymentApp";

components/payments/content/android/payment_feature_list.cc

@@ -38,7 +38,6 @@ const base::Feature* kFeaturesExposedToJava[] = {
     &features::kWebPaymentsSingleAppUiSkip,
     &kAndroidAppPaymentUpdateEvents,
     &kScrollToExpandPaymentHandler,
-    &kWebLayerPayments,
 };
 
 const base::Feature* FindFeatureExposedToJava(const std::string& feature_name) {
@@ -59,8 +58,6 @@ const base::Feature kAndroidAppPaymentUpdateEvents{
 // TODO(crbug.com/1094549): clean up after being stable.
 const base::Feature kScrollToExpandPaymentHandler{
     "ScrollToExpandPaymentHandler", base::FEATURE_ENABLED_BY_DEFAULT};
-const base::Feature kWebLayerPayments{"WebLayerPayments",
-                                      base::FEATURE_DISABLED_BY_DEFAULT};
 
 static jboolean JNI_PaymentFeatureList_IsEnabled(
     JNIEnv* env,

components/payments/content/android/payment_feature_list.h

@@ -14,7 +14,6 @@ namespace android {
 // Android only payment features in alphabetical order:
 extern const base::Feature kAndroidAppPaymentUpdateEvents;
 extern const base::Feature kScrollToExpandPaymentHandler;
-extern const base::Feature kWebLayerPayments;
 
 }  // namespace android
 }  // namespace payments

content/public/common/content_features.cc

@@ -830,7 +830,6 @@ const base::Feature kWebOtpBackend{"kWebOtpBackend",
                                    base::FEATURE_DISABLED_BY_DEFAULT};
 
 // The JavaScript API for payments on the web.
-// TODO(rouslan): Remove this.
 const base::Feature kWebPayments{"WebPayments",
                                  base::FEATURE_ENABLED_BY_DEFAULT};
 

weblayer/browser/java/org/chromium/weblayer_private/payments/WebLayerPaymentRequestFactory.java

@@ -24,7 +24,7 @@ public class WebLayerPaymentRequestFactory implements InterfaceFactory<PaymentRe
 
     @Override
     public PaymentRequest createImpl() {
-        if (!PaymentFeatureList.isEnabled(PaymentFeatureList.WEB_LAYER_PAYMENTS)) {
+        if (!PaymentFeatureList.isEnabled(PaymentFeatureList.WEB_PAYMENTS)) {
             return new InvalidPaymentRequest();
         }