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 83ea538b76d4b023fafaec50174fc9ebdafb1322..5675aa80c45261038d65efafbc8e0c1fe4525c06 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 |
@@ -45,7 +45,9 @@ import org.chromium.chrome.browser.tabmodel.TabModelObserver; |
import org.chromium.chrome.browser.tabmodel.TabModelSelector; |
import org.chromium.chrome.browser.tabmodel.TabModelSelectorObserver; |
import org.chromium.components.url_formatter.UrlFormatter; |
+import org.chromium.content_public.browser.RenderFrameHost; |
import org.chromium.content_public.browser.WebContents; |
+import org.chromium.content_public.browser.WebContentsStatics; |
import org.chromium.mojo.system.MojoException; |
import org.chromium.payments.mojom.CanMakePaymentQueryResult; |
import org.chromium.payments.mojom.PaymentComplete; |
@@ -244,6 +246,7 @@ public class PaymentRequestImpl |
}; |
private final Handler mHandler = new Handler(); |
+ private final RenderFrameHost mRenderFrameHost; |
private final WebContents mWebContents; |
private final String mSchemelessOriginForPaymentApp; |
private final String mOriginForDisplay; |
@@ -345,10 +348,11 @@ public class PaymentRequestImpl |
* |
* @param webContents The web contents that have invoked the PaymentRequest API. |
*/ |
- public PaymentRequestImpl(WebContents webContents) { |
- assert webContents != null; |
+ public PaymentRequestImpl(RenderFrameHost renderFrameHost) { |
+ assert renderFrameHost != null; |
- mWebContents = webContents; |
+ mRenderFrameHost = renderFrameHost; |
+ mWebContents = WebContentsStatics.fromRenderFrameHost(renderFrameHost); |
mSchemelessOriginForPaymentApp = UrlFormatter.formatUrlForSecurityDisplay( |
mWebContents.getLastCommittedUrl(), false /* omit scheme for payment apps. */); |
@@ -356,7 +360,8 @@ public class PaymentRequestImpl |
mOriginForDisplay = UrlFormatter.formatUrlForSecurityDisplay( |
mWebContents.getLastCommittedUrl(), true /* include scheme in display */); |
- mMerchantName = webContents.getTitle(); |
+ mMerchantName = mWebContents.getTitle(); |
+ |
mCertificateChain = CertificateChainHelper.getCertificateChain(mWebContents); |
mApps = new ArrayList<>(); |