[WebLayer] Encapsulates getContactSection in PaymentUiService

Before the CL, CPRService did
PaymentUiService.getContactSection().getSelectedItem(). This is not
convenient for unit tests because the tests have to mock the contact
section and the selected item.

This CL changes it so CPRService accesses the selected contact by proxy
of PaymentUiService.

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

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

@@ -490,9 +490,6 @@ public class ChromePaymentRequestService
     public boolean invokePaymentApp(EditableOption selectedShippingAddress,
             EditableOption selectedShippingOption, PaymentApp selectedPaymentApp) {
         if (mPaymentRequestService == null || mSpec == null || mSpec.isDestroyed()) return false;
-        EditableOption selectedContact = mPaymentUiService.getContactSection() != null
-                ? mPaymentUiService.getContactSection().getSelectedItem()
-                : null;
         selectedPaymentApp.setPaymentHandlerHost(getPaymentHandlerHost());
         // Only native apps can use PaymentDetailsUpdateService.
         if (selectedPaymentApp.getPaymentAppType() == PaymentAppType.NATIVE_MOBILE_APP) {
@@ -500,9 +497,10 @@ public class ChromePaymentRequestService
                     ((AndroidPaymentApp) selectedPaymentApp).packageName(),
                     mPaymentRequestService /* PaymentApp.PaymentRequestUpdateEventListener */);
         }
-        PaymentResponseHelperInterface paymentResponseHelper = new ChromePaymentResponseHelper(
-                selectedShippingAddress, selectedShippingOption, selectedContact,
-                selectedPaymentApp, mSpec.getPaymentOptions(), mSkipToGPayHelper != null);
+        PaymentResponseHelperInterface paymentResponseHelper =
+                new ChromePaymentResponseHelper(selectedShippingAddress, selectedShippingOption,
+                        mPaymentUiService.getSelectedContact(), selectedPaymentApp,
+                        mSpec.getPaymentOptions(), mSkipToGPayHelper != null);
         mPaymentRequestService.invokePaymentApp(selectedPaymentApp, paymentResponseHelper);
         return !selectedPaymentApp.isAutofillInstrument();
     }

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

@@ -4,6 +4,8 @@
 
 package org.chromium.chrome.browser.payments;
 
+import androidx.annotation.Nullable;
+
 import org.chromium.chrome.browser.autofill.PersonalDataManager;
 import org.chromium.chrome.browser.autofill.PersonalDataManager.AutofillProfile;
 import org.chromium.chrome.browser.autofill.PersonalDataManager.NormalizedAddressRequestDelegate;
@@ -22,6 +24,7 @@ import org.chromium.payments.mojom.PaymentResponse;
  */
 public class ChromePaymentResponseHelper
         implements NormalizedAddressRequestDelegate, PaymentResponseHelperInterface {
+    @Nullable
     private final AutofillContact mSelectedContact;
     private final PaymentApp mSelectedPaymentApp;
     private final PaymentOptions mPaymentOptions;
@@ -37,13 +40,13 @@ public class ChromePaymentResponseHelper
      * Builds a helper to contruct and fill a PaymentResponse.
      * @param selectedShippingAddress The shipping address picked by the user.
      * @param selectedShippingOption  The shipping option picked by the user.
-     * @param selectedContact         The contact info picked by the user.
+     * @param selectedContact         The contact info picked by the user, can be null.
      * @param selectedPaymentApp      The payment app picked by the user.
      * @param paymentOptions          The paymentOptions of the corresponding payment request.
      * @param skipToGpay              Whether or not Gpay bridge is activated for skip to Gpay.
      */
     public ChromePaymentResponseHelper(EditableOption selectedShippingAddress,
-            EditableOption selectedShippingOption, EditableOption selectedContact,
+            EditableOption selectedShippingOption, @Nullable AutofillContact selectedContact,
             PaymentApp selectedPaymentApp, PaymentOptions paymentOptions, boolean skipToGpay) {
         mPaymentResponse = new PaymentResponse();
         mPaymentResponse.payer = new PayerDetail();
@@ -52,9 +55,7 @@ public class ChromePaymentResponseHelper
         mPaymentOptions = paymentOptions;
         mSkipToGpay = skipToGpay;
 
-        // Contacts are created in ChromePaymentRequestService.init(). These should all be instances
-        // of AutofillContact.
-        mSelectedContact = (AutofillContact) selectedContact;
+        mSelectedContact = selectedContact;
 
         // Set up the shipping option section of the response when it comes from payment sheet
         // (Shipping option comes from payment app when the app can handle shipping, or from Gpay

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

@@ -422,6 +422,12 @@ public class PaymentUiService implements SettingsAutofillAndPaymentsObserver.Obs
         return mUiShippingOptions;
     }
 
+    /** @return The selected contact, can be null. */
+    @Nullable
+    public AutofillContact getSelectedContact() {
+        return mContactSection != null ? (AutofillContact) mContactSection.getSelectedItem() : null;
+    }
+
     /** Get the contact editor on PaymentRequest UI. */
     public ContactEditor getContactEditor() {
         return mContactEditor;