[WebLayer] Separates onPaymentDetailsNotUpdated

This CL separates onPaymentDetailsNotUpdated into the common part and
the chrome specific part. The common part is moved into PRService.

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

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

@@ -545,30 +545,10 @@ public class ChromePaymentRequestService implements BrowserPaymentRequest,
     }
 
     // Implement BrowserPaymentRequest:
-    /**
-     * Called when the merchant received a new shipping address, shipping option, or payment method
-     * info, but did not update the payment details in response.
-     */
     @Override
-    public void onPaymentDetailsNotUpdated() {
-        if (mPaymentRequestService == null) return;
-        // mSpec.recomputeSpecForDetails(), mSpec.selectedShippingOptionError() can be used only
-        // when mSpec has not been destroyed.
-        assert !mSpec.isDestroyed();
-
-        if (mPaymentUiService.getPaymentRequestUI() == null) {
-            mJourneyLogger.setAborted(AbortReason.INVALID_DATA_FROM_RENDERER);
-            disconnectFromClientWithDebugMessage(ErrorStrings.CANNOT_UPDATE_WITHOUT_SHOW);
-            return;
-        }
-
-        mSpec.recomputeSpecForDetails();
-
-        PaymentApp invokedPaymentApp = mPaymentRequestService.getInvokedPaymentApp();
-        if (invokedPaymentApp != null && invokedPaymentApp.isWaitingForPaymentDetailsUpdate()) {
-            invokedPaymentApp.onPaymentDetailsNotUpdated();
-            return;
-        }
+    public void onPaymentDetailsNotUpdated(@Nullable String selectedShippingOptionError) {
+        // This method is only supposed to be called by mPaymentRequestService.
+        assert mPaymentRequestService != null;
 
         if (mPaymentUiService.shouldShowShippingSection()
                 && (mPaymentUiService.getUiShippingOptions().isEmpty()
@@ -578,7 +558,7 @@ public class ChromePaymentRequestService implements BrowserPaymentRequest,
             mPaymentUiService.getShippingAddressesSection().setSelectedItemIndex(
                     SectionInformation.INVALID_SELECTION);
             mPaymentUiService.getShippingAddressesSection().setErrorMessage(
-                    mSpec.selectedShippingOptionError());
+                    selectedShippingOptionError);
         }
 
         boolean providedInformationToPaymentRequestUI =

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

@@ -44,8 +44,11 @@ public interface BrowserPaymentRequest {
      */
     void onPaymentDetailsUpdated(PaymentDetails details, boolean hasNotifiedInvokedPaymentApp);
 
-    /** The browser part of the {@link PaymentRequest#onPaymentDetailsNotUpdated} implementation. */
-    void onPaymentDetailsNotUpdated();
+    /**
+     * The browser part of the {@link PaymentRequest#onPaymentDetailsNotUpdated} implementation.
+     * @param selectedShippingOptionError The selected shipping option error, can be null.
+     */
+    void onPaymentDetailsNotUpdated(@Nullable String selectedShippingOptionError);
 
     /** The browser part of the {@link PaymentRequest#complete} implementation. */
     void complete(int result);

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

@@ -1025,7 +1025,18 @@ public class PaymentRequestService
      */
     /* package */ void onPaymentDetailsNotUpdated() {
         if (mBrowserPaymentRequest == null) return;
-        mBrowserPaymentRequest.onPaymentDetailsNotUpdated();
+        if (!mIsCurrentPaymentRequestShowing) {
+            mJourneyLogger.setAborted(AbortReason.INVALID_DATA_FROM_RENDERER);
+            disconnectFromClientWithDebugMessage(
+                    ErrorStrings.CANNOT_UPDATE_WITHOUT_SHOW, PaymentErrorReason.USER_CANCEL);
+            return;
+        }
+        mSpec.recomputeSpecForDetails();
+        if (mInvokedPaymentApp != null && mInvokedPaymentApp.isWaitingForPaymentDetailsUpdate()) {
+            mInvokedPaymentApp.onPaymentDetailsNotUpdated();
+            return;
+        }
+        mBrowserPaymentRequest.onPaymentDetailsNotUpdated(mSpec.selectedShippingOptionError());
     }
 
     /** The component part of the {@link PaymentRequest#abort} implementation. */

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

@@ -30,7 +30,7 @@ public class WebLayerPaymentRequestService implements BrowserPaymentRequest {
     }
 
     @Override
-    public void onPaymentDetailsNotUpdated() {
+    public void onPaymentDetailsNotUpdated(String selectedShippingOptionError) {
         assert false : "Not implemented yet";
     }