[WebLayer] Adds PaymentUiService#showShippingAddressError()

This CL adds PaymentUiService#showShippingAddressError() to encapsulate
the UI logic so as to simplify the boundary between the UI and the
business logic.

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

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

@@ -15,7 +15,6 @@ import org.chromium.chrome.browser.app.ChromeActivity;
 import org.chromium.chrome.browser.autofill.PersonalDataManager;
 import org.chromium.chrome.browser.payments.handler.PaymentHandlerCoordinator;
 import org.chromium.chrome.browser.payments.ui.PaymentUiService;
-import org.chromium.chrome.browser.payments.ui.SectionInformation;
 import org.chromium.components.autofill.EditableOption;
 import org.chromium.components.payments.AbortReason;
 import org.chromium.components.payments.BrowserPaymentRequest;
@@ -398,15 +397,8 @@ public class ChromePaymentRequestService
 
         if (hasNotifiedInvokedPaymentApp) return;
 
-        if (mPaymentUiService.shouldShowShippingSection()
-                && (mPaymentUiService.getUiShippingOptions().isEmpty()
-                        || !TextUtils.isEmpty(details.error))
-                && mPaymentUiService.getShippingAddressesSection().getSelectedItem() != null) {
-            mPaymentUiService.getShippingAddressesSection().getSelectedItem().setInvalid();
-            mPaymentUiService.getShippingAddressesSection().setSelectedItemIndex(
-                    SectionInformation.INVALID_SELECTION);
-            mPaymentUiService.getShippingAddressesSection().setErrorMessage(details.error);
-        }
+        String detailsError = mSpec.getPaymentDetails().error;
+        mPaymentUiService.showShippingAddressErrorIfApplicable(detailsError);
 
         boolean providedInformationToPaymentRequestUI =
                 mPaymentUiService.enableAndUpdatePaymentRequestUIWithPaymentInfo();
@@ -451,16 +443,7 @@ public class ChromePaymentRequestService
     // Implements BrowserPaymentRequest:
     @Override
     public void onPaymentDetailsNotUpdated(@Nullable String selectedShippingOptionError) {
-        if (mPaymentUiService.shouldShowShippingSection()
-                && (mPaymentUiService.getUiShippingOptions().isEmpty()
-                        || !TextUtils.isEmpty(mSpec.selectedShippingOptionError()))
-                && mPaymentUiService.getShippingAddressesSection().getSelectedItem() != null) {
-            mPaymentUiService.getShippingAddressesSection().getSelectedItem().setInvalid();
-            mPaymentUiService.getShippingAddressesSection().setSelectedItemIndex(
-                    SectionInformation.INVALID_SELECTION);
-            mPaymentUiService.getShippingAddressesSection().setErrorMessage(
-                    selectedShippingOptionError);
-        }
+        mPaymentUiService.showShippingAddressErrorIfApplicable(selectedShippingOptionError);
 
         boolean providedInformationToPaymentRequestUI =
                 mPaymentUiService.enableAndUpdatePaymentRequestUIWithPaymentInfo();

chrome/android/java/src/org/chromium/chrome/browser/payments/ui/PaymentUiService.java

@@ -908,6 +908,20 @@ public class PaymentUiService implements SettingsAutofillAndPaymentsObserver.Obs
         return isFirstUpdate;
     }
 
+    /**
+     * Shows the shipping address error if any.
+     * @param error The shipping address error, can be null.
+     */
+    public void showShippingAddressErrorIfApplicable(@Nullable String error) {
+        if (shouldShowShippingSection()
+                && (mUiShippingOptions.isEmpty() || !TextUtils.isEmpty(error))
+                && mShippingAddressesSection.getSelectedItem() != null) {
+            mShippingAddressesSection.getSelectedItem().setInvalid();
+            mShippingAddressesSection.setSelectedItemIndex(SectionInformation.INVALID_SELECTION);
+            mShippingAddressesSection.setErrorMessage(error);
+        }
+    }
+
     // Implements PaymentUiService.Delegate:
     @Override
     public boolean shouldShowShippingSection() {