[PRImpl] Move PRImpl#init UI logic into PaymentUIsManager

Change:
* Move the UI logic that's inlined in PRImpl#init into
PaymentUIsManager.
* Add PaymentOptionsUtils#requestAnyPayerInformation to simplify the
code.

Bug: 1102522

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

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

@@ -304,8 +304,6 @@ public class PaymentRequestImpl
     private final JourneyLogger mJourneyLogger;
     private final boolean mIsOffTheRecord;
 
-    private List<AutofillProfile> mAutofillProfiles;
-    private boolean mHaveRequestedAutofillData = true;
     private boolean mIsCanMakePaymentResponsePending;
     private boolean mIsHasEnrolledInstrumentResponsePending;
     private boolean mHasEnrolledInstrumentUsesPerMethodQuota;
@@ -571,43 +569,6 @@ public class PaymentRequestImpl
                 .onPaymentRequestParamsInitiated(
                         /*params=*/this);
 
-        if (PaymentOptionsUtils.requestAnyInformation(mPaymentOptions)) {
-            mAutofillProfiles = Collections.unmodifiableList(
-                    PersonalDataManager.getInstance().getProfilesToSuggest(
-                            false /* includeNameInLabel */));
-        }
-
-        if (mRequestShipping) {
-            boolean haveCompleteShippingAddress = false;
-            for (int i = 0; i < mAutofillProfiles.size(); i++) {
-                if (AutofillAddress.checkAddressCompletionStatus(
-                            mAutofillProfiles.get(i), AutofillAddress.CompletenessCheckType.NORMAL)
-                        == AutofillAddress.CompletionStatus.COMPLETE) {
-                    haveCompleteShippingAddress = true;
-                    break;
-                }
-            }
-            mHaveRequestedAutofillData &= haveCompleteShippingAddress;
-        }
-
-        if (mRequestPayerName || mRequestPayerPhone || mRequestPayerEmail) {
-            // Do not persist changes on disk in OffTheRecord mode.
-            mPaymentUIsManager.setContactEditor(new ContactEditor(mRequestPayerName,
-                    mRequestPayerPhone, mRequestPayerEmail, /*saveToDisk=*/!mIsOffTheRecord));
-            boolean haveCompleteContactInfo = false;
-            for (int i = 0; i < mAutofillProfiles.size(); i++) {
-                AutofillProfile profile = mAutofillProfiles.get(i);
-                if (mPaymentUIsManager.getContactEditor().checkContactCompletionStatus(
-                            profile.getFullName(), profile.getPhoneNumber(),
-                            profile.getEmailAddress())
-                        == ContactEditor.COMPLETE) {
-                    haveCompleteContactInfo = true;
-                    break;
-                }
-            }
-            mHaveRequestedAutofillData &= haveCompleteContactInfo;
-        }
-
         PaymentAppService.getInstance().create(/*delegate=*/this);
 
         // Log the various types of payment methods that were requested by the merchant.
@@ -750,12 +711,13 @@ public class PaymentRequestImpl
         }
 
         if (shouldShowShippingSection() && !mWaitForUpdatedDetails) {
-            createShippingSection(activity, mAutofillProfiles);
+            createShippingSection(activity, mPaymentUIsManager.getAutofillProfiles());
         }
 
         if (shouldShowContactSection()) {
-            mPaymentUIsManager.setContactSection(new ContactDetailsSection(activity,
-                    mAutofillProfiles, mPaymentUIsManager.getContactEditor(), mJourneyLogger));
+            mPaymentUIsManager.setContactSection(
+                    new ContactDetailsSection(activity, mPaymentUIsManager.getAutofillProfiles(),
+                            mPaymentUIsManager.getContactEditor(), mJourneyLogger));
         }
 
         mPaymentUIsManager.setPaymentRequestUI(new PaymentRequestUI(activity, this,
@@ -1323,7 +1285,7 @@ public class PaymentRequestImpl
         // Do not create shipping section When UI is not built yet. This happens when the show
         // promise gets resolved before all apps are ready.
         if (mPaymentUIsManager.getPaymentRequestUI() != null && shouldShowShippingSection()) {
-            createShippingSection(chromeActivity, mAutofillProfiles);
+            createShippingSection(chromeActivity, mPaymentUIsManager.getAutofillProfiles());
         }
 
         mWaitForUpdatedDetails = false;
@@ -1553,13 +1515,14 @@ public class PaymentRequestImpl
                     && mPaymentUIsManager.getShippingAddressesSection() == null) {
                 ChromeActivity activity = ChromeActivity.fromWebContents(mWebContents);
                 assert activity != null;
-                createShippingSection(activity, mAutofillProfiles);
+                createShippingSection(activity, mPaymentUIsManager.getAutofillProfiles());
             }
             if (shouldShowContactSection() && mPaymentUIsManager.getContactSection() == null) {
                 ChromeActivity activity = ChromeActivity.fromWebContents(mWebContents);
                 assert activity != null;
                 mPaymentUIsManager.setContactSection(new ContactDetailsSection(activity,
-                        mAutofillProfiles, mPaymentUIsManager.getContactEditor(), mJourneyLogger));
+                        mPaymentUIsManager.getAutofillProfiles(),
+                        mPaymentUIsManager.getContactEditor(), mJourneyLogger));
             }
             mPaymentUIsManager.onSelectedPaymentMethodUpdated();
             PaymentApp paymentApp = (PaymentApp) option;
@@ -2266,7 +2229,7 @@ public class PaymentRequestImpl
         if (getClient() == null) return;
 
         mHideServerAutofillCards |= paymentApp.isServerAutofillInstrumentReplacement();
-        paymentApp.setHaveRequestedAutofillData(mHaveRequestedAutofillData);
+        paymentApp.setHaveRequestedAutofillData(mPaymentUIsManager.haveRequestedAutofillData());
         mHasEnrolledInstrument |= paymentApp.canMakePayment();
         mHasNonAutofillApp |= !paymentApp.isAutofillInstrument();
 

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

@@ -11,6 +11,8 @@ import androidx.annotation.VisibleForTesting;
 
 import org.chromium.base.Callback;
 import org.chromium.chrome.browser.ChromeActivity;
+import org.chromium.chrome.browser.autofill.PersonalDataManager;
+import org.chromium.chrome.browser.autofill.PersonalDataManager.AutofillProfile;
 import org.chromium.chrome.browser.autofill.PersonalDataManager.CreditCard;
 import org.chromium.chrome.browser.payments.AddressEditor;
 import org.chromium.chrome.browser.payments.AutofillAddress;
@@ -39,6 +41,7 @@ import org.chromium.payments.mojom.PaymentCurrencyAmount;
 import org.chromium.payments.mojom.PaymentDetails;
 import org.chromium.payments.mojom.PaymentDetailsModifier;
 import org.chromium.payments.mojom.PaymentItem;
+import org.chromium.payments.mojom.PaymentOptions;
 import org.chromium.payments.mojom.PaymentShippingOption;
 import org.chromium.url.GURL;
 
@@ -61,6 +64,7 @@ import java.util.Set;
 public class PaymentUIsManager implements SettingsAutofillAndPaymentsObserver.Observer,
                                           PaymentRequestLifecycleObserver,
                                           PaymentHandlerUiObserver {
+    private final boolean mIsOffTheRecord;
     private final Handler mHandler = new Handler();
     private final Queue<Runnable> mRetryQueue = new LinkedList<>();
     private ContactEditor mContactEditor;
@@ -82,7 +86,8 @@ public class PaymentUIsManager implements SettingsAutofillAndPaymentsObserver.Ob
     private SectionInformation mShippingAddressesSection;
     private ContactDetailsSection mContactSection;
     private AutofillPaymentAppCreator mAutofillPaymentAppCreator;
-
+    private boolean mHaveRequestedAutofillData = true;
+    private List<AutofillProfile> mAutofillProfiles;
     private Boolean mCanUserAddCreditCard;
 
     /** The delegate of this class. */
@@ -166,6 +171,7 @@ public class PaymentUIsManager implements SettingsAutofillAndPaymentsObserver.Ob
 
         mPaymentUisShowStateReconciler = new PaymentUisShowStateReconciler();
         mCurrencyFormatterMap = new HashMap<>();
+        mIsOffTheRecord = isOffTheRecord;
     }
 
     /**
@@ -302,16 +308,21 @@ public class PaymentUIsManager implements SettingsAutofillAndPaymentsObserver.Ob
         return mContactEditor;
     }
 
-    /** Set the contact editor for PaymentRequest UI. */
-    public void setContactEditor(ContactEditor contactEditor) {
-        mContactEditor = contactEditor;
-    }
-
     /** Get the retry queue. */
     public Queue<Runnable> getRetryQueue() {
         return mRetryQueue;
     }
 
+    /** @return The autofill profiles. */
+    public List<AutofillProfile> getAutofillProfiles() {
+        return mAutofillProfiles;
+    }
+
+    /** @return Whether PaymentRequestUI has requested autofill data. */
+    public boolean haveRequestedAutofillData() {
+        return mHaveRequestedAutofillData;
+    }
+
     // Implement SettingsAutofillAndPaymentsObserver.Observer:
     @Override
     public void onAddressUpdated(AutofillAddress address) {
@@ -393,6 +404,45 @@ public class PaymentUIsManager implements SettingsAutofillAndPaymentsObserver.Ob
         mCanUserAddCreditCard = mMerchantSupportsAutofillCards
                 && !PaymentFeatureList.isEnabledOrExperimentalFeaturesEnabled(
                         PaymentFeatureList.STRICT_HAS_ENROLLED_AUTOFILL_INSTRUMENT);
+
+        if (PaymentOptionsUtils.requestAnyInformation(mParams.getPaymentOptions())) {
+            mAutofillProfiles = Collections.unmodifiableList(
+                    PersonalDataManager.getInstance().getProfilesToSuggest(
+                            false /* includeNameInLabel */));
+        }
+
+        if (PaymentOptionsUtils.requestShipping(mParams.getPaymentOptions())) {
+            boolean haveCompleteShippingAddress = false;
+            for (int i = 0; i < mAutofillProfiles.size(); i++) {
+                if (AutofillAddress.checkAddressCompletionStatus(
+                            mAutofillProfiles.get(i), AutofillAddress.CompletenessCheckType.NORMAL)
+                        == AutofillAddress.CompletionStatus.COMPLETE) {
+                    haveCompleteShippingAddress = true;
+                    break;
+                }
+            }
+            mHaveRequestedAutofillData &= haveCompleteShippingAddress;
+        }
+
+        PaymentOptions options = mParams.getPaymentOptions();
+        if (PaymentOptionsUtils.requestAnyContactInformation(mParams.getPaymentOptions())) {
+            // Do not persist changes on disk in OffTheRecord mode.
+            mContactEditor = new ContactEditor(PaymentOptionsUtils.requestPayerName(options),
+                    PaymentOptionsUtils.requestPayerPhone(options),
+                    PaymentOptionsUtils.requestPayerEmail(options),
+                    /*saveToDisk=*/!mIsOffTheRecord);
+            boolean haveCompleteContactInfo = false;
+            for (int i = 0; i < getAutofillProfiles().size(); i++) {
+                AutofillProfile profile = getAutofillProfiles().get(i);
+                if (getContactEditor().checkContactCompletionStatus(profile.getFullName(),
+                            profile.getPhoneNumber(), profile.getEmailAddress())
+                        == ContactEditor.COMPLETE) {
+                    haveCompleteContactInfo = true;
+                    break;
+                }
+            }
+            mHaveRequestedAutofillData &= haveCompleteContactInfo;
+        }
     }
 
     /** @return The selected payment app type. */

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

@@ -23,6 +23,15 @@ public class PaymentOptionsUtils {
                 || options.requestPayerName;
     }
 
+    /**
+     * @param options Any PaymentOption, can be null.
+     * @return Whether a PaymentOptions has requested any payer's information (email, phone, name).
+     */
+    public static boolean requestAnyContactInformation(@Nullable PaymentOptions options) {
+        if (options == null) return false;
+        return options.requestPayerEmail || options.requestPayerPhone || options.requestPayerName;
+    }
+
     /**
      * @param options Any PaymentOptions, can be null.
      * @return Return a JSON string indicating whether each information is requested in the