[WebLayer] Rename the Complete() test callbacks

Renames:
* onCompleteCalled -> onCompleteHandled
* onCompleteReplied -> onCompleteHandled

Bug: 1131059

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

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

@@ -149,7 +149,7 @@ public class PaymentRequestTestRule extends ChromeTabbedActivityTestRule
     final CallbackHelper mHasEnrolledInstrumentQueryResponded;
     final CallbackHelper mExpirationMonthChange;
     final CallbackHelper mPaymentResponseReady;
-    final CallbackHelper mCompleteReplied;
+    final CallbackHelper mCompleteHandled;
     final CallbackHelper mRendererClosedMojoConnection;
     private ChromePaymentRequestDelegateImpl mChromePaymentRequestDelegateImpl;
     PaymentRequestUI mUI;
@@ -237,7 +237,7 @@ public class PaymentRequestTestRule extends ChromeTabbedActivityTestRule
         mShowFailed = new CallbackHelper();
         mCanMakePaymentQueryResponded = new CallbackHelper();
         mHasEnrolledInstrumentQueryResponded = new CallbackHelper();
-        mCompleteReplied = new CallbackHelper();
+        mCompleteHandled = new CallbackHelper();
         mRendererClosedMojoConnection = new CallbackHelper();
         mWebContentsRef = new AtomicReference<>();
         if (testFilePath.equals("about:blank") || testFilePath.startsWith("data:")) {
@@ -331,8 +331,8 @@ public class PaymentRequestTestRule extends ChromeTabbedActivityTestRule
     public CallbackHelper getPaymentResponseReady() {
         return mPaymentResponseReady;
     }
-    public CallbackHelper getCompleteReplied() {
-        return mCompleteReplied;
+    public CallbackHelper getCompleteHandled() {
+        return mCompleteHandled;
     }
     public CallbackHelper getRendererClosedMojoConnection() {
         return mRendererClosedMojoConnection;
@@ -1147,9 +1147,9 @@ public class PaymentRequestTestRule extends ChromeTabbedActivityTestRule
     }
 
     @Override
-    public void onCompleteReplied() {
+    public void onCompletedHandled() {
         ThreadUtils.assertOnUiThread();
-        mCompleteReplied.notifyCalled();
+        mCompleteHandled.notifyCalled();
     }
 
     @Override

chrome/test/android/test_support/src/org/chromium/chrome/test_support/PaymentRequestTestBridge.java

@@ -108,14 +108,14 @@ public class PaymentRequestTestBridge {
         private final long mOnNotSupportedErrorPtr;
         private final long mOnConnectionTerminatedPtr;
         private final long mOnAbortCalledPtr;
-        private final long mOnCompleteCalledPtr;
+        private final long mOnCompleteHandledPtr;
         private final long mOnMinimalUIReadyPtr;
 
         PaymentRequestNativeObserverBridgeToNativeForTest(long onCanMakePaymentCalledPtr,
                 long onCanMakePaymentReturnedPtr, long onHasEnrolledInstrumentCalledPtr,
                 long onHasEnrolledInstrumentReturnedPtr, long onAppListReadyPtr,
                 long setAppDescriptionPtr, long onNotSupportedErrorPtr,
-                long onConnectionTerminatedPtr, long onAbortCalledPtr, long onCompleteCalledPtr,
+                long onConnectionTerminatedPtr, long onAbortCalledPtr, long onCompleteHandledPtr,
                 long onMinimalUIReadyPtr) {
             mOnCanMakePaymentCalledPtr = onCanMakePaymentCalledPtr;
             mOnCanMakePaymentReturnedPtr = onCanMakePaymentReturnedPtr;
@@ -126,7 +126,7 @@ public class PaymentRequestTestBridge {
             mOnNotSupportedErrorPtr = onNotSupportedErrorPtr;
             mOnConnectionTerminatedPtr = onConnectionTerminatedPtr;
             mOnAbortCalledPtr = onAbortCalledPtr;
-            mOnCompleteCalledPtr = onCompleteCalledPtr;
+            mOnCompleteHandledPtr = onCompleteHandledPtr;
             mOnMinimalUIReadyPtr = onMinimalUIReadyPtr;
         }
 
@@ -203,8 +203,8 @@ public class PaymentRequestTestBridge {
             nativeResolvePaymentRequestObserverCallback(mOnAbortCalledPtr);
         }
         @Override
-        public void onCompleteCalled() {
-            nativeResolvePaymentRequestObserverCallback(mOnCompleteCalledPtr);
+        public void onCompleteHandled() {
+            nativeResolvePaymentRequestObserverCallback(mOnCompleteHandledPtr);
         }
         @Override
         public void onMinimalUIReady() {

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

@@ -161,7 +161,7 @@ public class PaymentRequestService
         void onNotSupportedError();
         void onConnectionTerminated();
         void onAbortCalled();
-        void onCompleteCalled();
+        void onCompleteHandled();
         void onMinimalUIReady();
         void onPaymentUiServiceCreated(PaymentUiServiceTestInterface uiService);
         void onClosed();
@@ -246,10 +246,10 @@ public class PaymentRequestService
         void onPaymentResponseReady();
 
         /**
-         * Called when the browser acknowledges the renderer's complete call, which indicates that
+         * Called when the browser has handled the renderer's complete call, which indicates that
          * the browser UI has closed.
          */
-        void onCompleteReplied();
+        void onCompletedHandled();
 
         /**
          * Called when the renderer is closing the mojo connection (e.g. upon show promise
@@ -1071,10 +1071,10 @@ public class PaymentRequestService
 
     private void onCompleteHandled() {
         if (sNativeObserverForTest != null) {
-            sNativeObserverForTest.onCompleteCalled();
+            sNativeObserverForTest.onCompleteHandled();
         }
         if (sObserverForTest != null) {
-            sObserverForTest.onCompleteReplied();
+            sObserverForTest.onCompletedHandled();
         }
         if (mClient != null) mClient.onComplete();
     }