[Payments] Implement openWindow for service worker based payment handler

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 d21b63675cbc9a6dc3f9c8857101858c4db2fff7..e365b04c1d70de60cf40c74d8672cfd5fb089fbf 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
@@ -258,6 +258,7 @@ public class PaymentRequestImpl implements PaymentRequest, PaymentRequestUI.Clie
     private final RenderFrameHost mRenderFrameHost;
     private final WebContents mWebContents;
     private final String mTopLevelOrigin;
+    private final String mTopLevelOriginForDisplay;
     private final String mPaymentRequestOrigin;
     private final String mMerchantName;
     @Nullable
@@ -365,10 +366,9 @@ public class PaymentRequestImpl implements PaymentRequest, PaymentRequestUI.Clie
         mRenderFrameHost = renderFrameHost;
         mWebContents = WebContentsStatics.fromRenderFrameHost(renderFrameHost);
 
-        mPaymentRequestOrigin = UrlFormatter.formatUrlForSecurityDisplay(
-                mRenderFrameHost.getLastCommittedURL(), true);
-        mTopLevelOrigin =
-                UrlFormatter.formatUrlForSecurityDisplay(mWebContents.getLastCommittedUrl(), true);
+        mPaymentRequestOrigin = mRenderFrameHost.getLastCommittedURL();
+        mTopLevelOrigin = mWebContents.getLastCommittedUrl();

[please use gerrit instead, 2017/05/25 14:53:26]

That's a top level URL, because it contains the full path. Origins do not have a
path. Therefore, this variable should be called mTopLevelUrl.

[gogerald1, 2017/05/25 16:53:32]

Done.

+        mTopLevelOriginForDisplay = UrlFormatter.formatUrlForSecurityDisplay(mTopLevelOrigin, true);

[please use gerrit instead, 2017/05/25 14:53:26]

This should remain mTopLevelOrigin.

[gogerald1, 2017/05/25 16:53:32]

Done.

 
         mMerchantName = mWebContents.getTitle();
 
@@ -517,7 +517,8 @@ public class PaymentRequestImpl implements PaymentRequest, PaymentRequestUI.Clie
         mUI = new PaymentRequestUI(activity, this, mRequestShipping,
                 mRequestPayerName || mRequestPayerPhone || mRequestPayerEmail,
                 mMerchantSupportsAutofillPaymentInstruments,
-                !PaymentPreferencesUtil.isPaymentCompleteOnce(), mMerchantName, mTopLevelOrigin,
+                !PaymentPreferencesUtil.isPaymentCompleteOnce(), mMerchantName,
+                mTopLevelOriginForDisplay,
                 SecurityStateModel.getSecurityLevelForWebContents(mWebContents),
                 new ShippingStrings(mShippingType));