Send origin of the iframe browsing context

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

 // Copyright 2017 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.chrome.browser.payments;
 
 import android.app.Activity;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.DialogInterface;
@@ skipping 39 matching lines @@
 
     /** The maximum number of milliseconds to wait for a response from a READY_TO_PAY service. */
     private static final long READY_TO_PAY_TIMEOUT_MS = 400;
 
     /** The maximum number of milliseconds to wait for a connection to READY_TO_PAY service. */
     private static final long SERVICE_CONNECTION_TIMEOUT_MS = 1000;
 
     private static final String EXTRA_METHOD_NAME = "methodName";
     private static final String EXTRA_DATA = "data";
     private static final String EXTRA_ORIGIN = "origin";
+    private static final String EXTRA_IFRAME_ORIGIN = "iframeOrigin";
     private static final String EXTRA_DETAILS = "details";
     private static final String EXTRA_INSTRUMENT_DETAILS = "instrumentDetails";
     private static final String EXTRA_CERTIFICATE_CHAIN = "certificateChain";
     private static final String EXTRA_CERTIFICATE = "certificate";
     private static final String EMPTY_JSON_DATA = "{}";
     private final Handler mHandler;
     private final WebContents mWebContents;
     private final Intent mIsReadyToPayIntent;
     private final Intent mPayIntent;
     private final Set<String> mMethodNames;
@@ skipping 46 matching lines @@
                 Bundle bundle = new Bundle();
                 bundle.putByteArray(EXTRA_CERTIFICATE, certificateChain[i]);
                 certificateArray[i] = bundle;
             }
             extras.putParcelableArray(EXTRA_CERTIFICATE_CHAIN, certificateArray);
         }
     }
 
     @Override
     public void getInstruments(Map<String, PaymentMethodData> methodData, String origin,
-            byte[][] certificateChain, InstrumentsCallback callback) {
+            String iframeOrigin, byte[][] certificateChain, InstrumentsCallback callback) {
         assert mInstrumentsCallback
                 == null : "Have not responded to previous request for instruments yet";
         mInstrumentsCallback = callback;
         if (mIsReadyToPayIntent.getComponent() == null) {
             respondToGetInstrumentsQuery(AndroidPaymentApp.this);
             return;
         }
 
         assert !mIsIncognito;
         Bundle extras = new Bundle();
         extras.putString(EXTRA_METHOD_NAME, mMethodNames.iterator().next());
         extras.putString(EXTRA_ORIGIN, origin);
+        extras.putString(EXTRA_IFRAME_ORIGIN, iframeOrigin);
         PaymentMethodData data = methodData.get(mMethodNames.iterator().next());
         extras.putString(EXTRA_DATA, data == null ? EMPTY_JSON_DATA : data.stringifiedData);
         addCertificateChain(extras, certificateChain);
         mIsReadyToPayIntent.putExtras(extras);
 
         mServiceConnection = new ServiceConnection() {
             @Override
             public void onServiceConnected(ComponentName name, IBinder service) {
                 IsReadyToPayService isReadyToPayService =
                         IsReadyToPayService.Stub.asInterface(service);
@@ skipping 97 matching lines @@
         return Collections.unmodifiableSet(mMethodNames);
     }
 
     @Override
     public Set<String> getInstrumentMethodNames() {
         return getAppMethodNames();
     }
 
     @Override
     public void invokePaymentApp(final String merchantName, final String origin,
-            final byte[][] certificateChain, final Map<String, PaymentMethodData> methodDataMap,
-            final PaymentItem total, final List<PaymentItem> displayItems,
+            final String iframeOrigin, final byte[][] certificateChain,
+            final Map<String, PaymentMethodData> methodDataMap, final PaymentItem total,
+            final List<PaymentItem> displayItems,
             final Map<String, PaymentDetailsModifier> modifiers,
             InstrumentDetailsCallback callback) {
         mInstrumentDetailsCallback = callback;
 
         if (!mIsIncognito) {
-            launchPaymentApp(merchantName, origin, certificateChain, methodDataMap, total,
-                    displayItems, modifiers);
+            launchPaymentApp(merchantName, origin, iframeOrigin, certificateChain, methodDataMap,
+                    total, displayItems, modifiers);
             return;
         }
 
         ChromeActivity activity = ChromeActivity.fromWebContents(mWebContents);
         if (activity == null) {
             notifyErrorInvokingPaymentApp();
             return;
         }
 
         new AlertDialog.Builder(activity, R.style.AlertDialogTheme)
                 .setTitle(R.string.external_app_leave_incognito_warning_title)
                 .setMessage(R.string.external_payment_app_leave_incognito_warning)
                 .setPositiveButton(R.string.ok,
                         new OnClickListener() {
                             @Override
                             public void onClick(DialogInterface dialog, int which) {
-                                launchPaymentApp(merchantName, origin, certificateChain,
-                                        methodDataMap, total, displayItems, modifiers);
+                                launchPaymentApp(merchantName, origin, iframeOrigin,
+                                        certificateChain, methodDataMap, total, displayItems,
+                                        modifiers);
                             }
                         })
                 .setNegativeButton(R.string.cancel,
                         new OnClickListener() {
                             @Override
                             public void onClick(DialogInterface dialog, int which) {
                                 notifyErrorInvokingPaymentApp();
                             }
                         })
                 .setOnCancelListener(new OnCancelListener() {
                     @Override
                     public void onCancel(DialogInterface dialog) {
                         notifyErrorInvokingPaymentApp();
                     }
                 })
                 .show();
     }
 
-    private void launchPaymentApp(String merchantName, String origin, byte[][] certificateChain,
-            Map<String, PaymentMethodData> methodDataMap, PaymentItem total,
-            List<PaymentItem> displayItems, Map<String, PaymentDetailsModifier> modifiers) {
+    private void launchPaymentApp(String merchantName, String origin, String iframeOrigin,
+            byte[][] certificateChain, Map<String, PaymentMethodData> methodDataMap,
+            PaymentItem total, List<PaymentItem> displayItems,
+            Map<String, PaymentDetailsModifier> modifiers) {
         assert mInstrumentDetailsCallback != null;
         assert !mMethodNames.isEmpty();
         Bundle extras = new Bundle();
         extras.putString(EXTRA_ORIGIN, origin);
+        extras.putString(EXTRA_IFRAME_ORIGIN, iframeOrigin);
         addCertificateChain(extras, certificateChain);
 
         String methodName = mMethodNames.iterator().next();
         extras.putString(EXTRA_METHOD_NAME, methodName);
 
         PaymentMethodData methodData = methodDataMap.get(methodName);
         extras.putString(
                 EXTRA_DATA, methodData == null ? EMPTY_JSON_DATA : methodData.stringifiedData);
 
         String details = serializeDetails(total, displayItems);
@@ skipping 77 matching lines @@
             mInstrumentDetailsCallback.onInstrumentDetailsReady(
                     data.getExtras().getString(EXTRA_METHOD_NAME),
                     data.getExtras().getString(EXTRA_INSTRUMENT_DETAILS));
         }
         mInstrumentDetailsCallback = null;
     }
 
     @Override
     public void dismissInstrument() {}
 }