payment cleanup: rename ComponentPaymentRequest PaymentRequestService

Bug: 1137006

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

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

@@ -211,7 +211,7 @@ public class ChromePaymentRequestFactory implements InterfaceFactory<PaymentRequ
         return PaymentRequestService.createPaymentRequest(mRenderFrameHost,
                 /*isOffTheRecord=*/delegate.isOffTheRecord(),
                 /*skipUiForBasicCard=*/delegate.skipUiForBasicCard(), delegate,
-                (componentPaymentRequest)
-                        -> new ChromePaymentRequestService(componentPaymentRequest, delegate));
+                (paymentRequestService)
+                        -> new ChromePaymentRequestService(paymentRequestService, delegate));
     }
 }

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

@@ -145,7 +145,7 @@ public class PaymentRequestTestRule extends ChromeTabbedActivityTestRule
     final CallbackHelper mPaymentResponseReady;
     final CallbackHelper mCompleteReplied;
     final CallbackHelper mRendererClosedMojoConnection;
-    PaymentRequestService mComponentPaymentRequest;
+    PaymentRequestService mPaymentRequestService;
     PaymentRequestUI mUI;
 
     private final boolean mDelayStartActivity;
@@ -1001,7 +1001,7 @@ public class PaymentRequestTestRule extends ChromeTabbedActivityTestRule
     /** Allows to skip UI into paymenthandler for"basic-card". */
     protected void enableSkipUIForBasicCard() {
         ThreadUtils.runOnUiThreadBlocking(
-                () -> mComponentPaymentRequest.setSkipUiForNonUrlPaymentMethodIdentifiersForTest());
+                () -> mPaymentRequestService.setSkipUiForNonUrlPaymentMethodIdentifiersForTest());
     }
 
     @Override
@@ -1059,9 +1059,9 @@ public class PaymentRequestTestRule extends ChromeTabbedActivityTestRule
     }
 
     @Override
-    public void onPaymentRequestCreated(PaymentRequestService paymentRequest) {
+    public void onPaymentRequestCreated(PaymentRequestService paymentRequestService) {
         ThreadUtils.assertOnUiThread();
-        mComponentPaymentRequest = paymentRequest;
+        mPaymentRequestService = paymentRequestService;
     }
 
     @Override

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

@@ -147,9 +147,9 @@ public class PaymentRequestService {
         /**
          * Called after an instance of {@link PaymentRequestService} has been created.
          *
-         * @param componentPaymentRequest The newly created instance of PaymentRequestService.
+         * @param paymentRequestService The newly created instance of PaymentRequestService.
          */
-        void onPaymentRequestCreated(PaymentRequestService componentPaymentRequest);
+        void onPaymentRequestCreated(PaymentRequestService paymentRequestService);
 
         /**
          * Called when an abort request was denied.