Factor getCertificateChain out of ConnectionPopupInfo

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

Index: chrome/android/java/src/org/chromium/chrome/browser/payments/PaymentRequestImpl.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/payments/PaymentRequestImpl.java b/chrome/android/java/src/org/chromium/chrome/browser/payments/PaymentRequestImpl.java
index 67c7e4f215a9690857478849654772026775ca39..933f161b3b657a7acca7c7ea59ddbf243e40b1aa 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/payments/PaymentRequestImpl.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/payments/PaymentRequestImpl.java
@@ -20,6 +20,7 @@ import org.chromium.chrome.browser.ChromeFeatureList;
 import org.chromium.chrome.browser.autofill.PersonalDataManager;
 import org.chromium.chrome.browser.autofill.PersonalDataManager.AutofillProfile;
 import org.chromium.chrome.browser.favicon.FaviconHelper;
+import org.chromium.chrome.browser.pageinfo.ConnectionInfoPopup;
 import org.chromium.chrome.browser.payments.ui.Completable;
 import org.chromium.chrome.browser.payments.ui.LineItem;
 import org.chromium.chrome.browser.payments.ui.PaymentInformation;
@@ -201,6 +202,7 @@ public class PaymentRequestImpl implements PaymentRequest, PaymentRequestUI.Clie
     private final ChromeActivity mContext;
     private final String mMerchantName;
     private final String mOrigin;
+    private final byte[][] mCertificateChain;
     private final List<PaymentApp> mApps;
     private final AddressEditor mAddressEditor;
     private final CardEditor mCardEditor;
@@ -278,6 +280,7 @@ public class PaymentRequestImpl implements PaymentRequest, PaymentRequestUI.Clie
         // The feature is available only in secure context, so it's OK to not show HTTPS.
         mOrigin = UrlFormatter.formatUrlForSecurityDisplay(
                 webContents.getLastCommittedUrl(), false);
+        mCertificateChain = ConnectionInfoPopup.getCertificateChain(webContents);
 
         final FaviconHelper faviconHelper = new FaviconHelper();
         faviconHelper.getLocalFaviconImageForURL(Profile.getLastUsedProfile(),
@@ -539,7 +542,7 @@ public class PaymentRequestImpl implements PaymentRequest, PaymentRequestUI.Clie
         // so a fast response from a non-autofill payment app at the front of the app list does not
         // cause NOT_SUPPORTED payment rejection.
         for (Map.Entry<PaymentApp, Map<String, PaymentMethodData>> q : queryApps.entrySet()) {
-            q.getKey().getInstruments(q.getValue(), this);
+            q.getKey().getInstruments(q.getValue(), mCertificateChain, this);
         }
     }
 
@@ -1006,8 +1009,8 @@ public class PaymentRequestImpl implements PaymentRequest, PaymentRequestUI.Clie
             }
         }
 
-        instrument.invokePaymentApp(mMerchantName, mOrigin, mRawTotal, mRawLineItems,
-                Collections.unmodifiableMap(methodData), this);
+        instrument.invokePaymentApp(mMerchantName, mOrigin, mCertificateChain, mRawTotal,
+                mRawLineItems, Collections.unmodifiableMap(methodData), this);
         recordSuccessFunnelHistograms("PayClicked");
         return !(instrument instanceof AutofillPaymentInstrument);
     }