** DO NOT COMMIT** Only for test

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

 // Copyright 2016 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 org.chromium.base.annotations.CalledByNative;
 import org.chromium.base.annotations.SuppressFBWarnings;
 import org.chromium.content_public.browser.WebContents;
 import org.chromium.payments.mojom.PaymentDetailsModifier;
@@ skipping 15 matching lines @@
 public class ServiceWorkerPaymentAppBridge implements PaymentAppFactory.PaymentAppFactoryAddition {
     @Override
     public void create(WebContents webContents, Set<String> methodNames,
             PaymentAppFactory.PaymentAppCreatedCallback callback) {
         nativeGetAllPaymentApps(webContents, callback);
     }
 
     /**
      * Invoke a payment app with a given option and matching method data.
      *
-     * @param webContents    The web contents that invoked PaymentRequest.
-     * @param registrationId The service worker registration ID of the Payment App.
-     * @param optionId       The ID of the PaymentOption that was selected by the user.
-     * @param methodData     The PaymentMethodData objects that are relevant for this payment
-     *                       app.
-     * @param total          The PaymentItem that represents the total cost of the payment.
-     * @param modifiers      Payment method specific modifiers to the payment items and the total.
-     * @param callback       Called after the payment app is finished running.
+     * @param webContents      The web contents that invoked PaymentRequest.
+     * @param registrationId   The service worker registration ID of the Payment App.
+     * @param origin           The origin of this merchant.
+     * @param iframeOrigin     The origin of the iframe that invoked PaymentRequest. Same as origin
+     *                         if PaymentRequest was not invoked from inside an iframe.
+     * @param paymentRequestId The unique identifier of the PaymentRequest.
+     * @param methodData       The PaymentMethodData objects that are relevant for this payment
+     *                         app.
+     * @param total            The PaymentItem that represents the total cost of the payment.
+     * @param modifiers        Payment method specific modifiers to the payment items and the total.
+     * @param instrumentId     The ID of the PaymentInstrument that was selected by the user.
+     * @param callback         Called after the payment app is finished running.
      */
-    public static void invokePaymentApp(WebContents webContents, long registrationId,
-            String optionId, String origin, String unusedIframeOrigin,
-            Set<PaymentMethodData> methodData, PaymentItem total, List<PaymentItem> displayItems,
-            Set<PaymentDetailsModifier> modifiers,
+    public static void invokePaymentApp(WebContents webContents, long registrationId, String origin,
+            String iframeOrigin, String paymentRequestId, Set<PaymentMethodData> methodData,
+            PaymentItem total, Set<PaymentDetailsModifier> modifiers, String instrumentId,
             PaymentInstrument.InstrumentDetailsCallback callback) {
-        nativeInvokePaymentApp(webContents, registrationId, optionId, origin,
+        nativeInvokePaymentApp(webContents, registrationId, origin, iframeOrigin, paymentRequestId,
                 methodData.toArray(new PaymentMethodData[0]), total,
-                modifiers.toArray(new PaymentDetailsModifier[0]), callback);
+                modifiers.toArray(new PaymentDetailsModifier[0]), instrumentId, callback);
     }
 
     @CalledByNative
     private static List<PaymentInstrument> createInstrumentList() {
         return new ArrayList<PaymentInstrument>();
     }
 
     @CalledByNative
     private static void addInstrument(List<PaymentInstrument> instruments, WebContents webContents,
             long swRegistrationId, String instrumentId, String label, String[] methodNameArray) {
@@ skipping 72 matching lines @@
      * has been resolved.
      */
     private static native void nativeGetAllPaymentApps(WebContents webContents, Object callback);
 
     /*
      * TODO(tommyt): crbug.com/505554. Change the |callback| parameter below to
      * be of type PaymentInstrument.InstrumentDetailsCallback, once this JNI bug
      * has been resolved.
      */
     private static native void nativeInvokePaymentApp(WebContents webContents, long registrationId,
-            String optionId, String origin, PaymentMethodData[] methodData, PaymentItem total,
-            PaymentDetailsModifier[] modifiers, Object callback);
+            String topLevelOrigin, String paymentRequestOrigin, String paymentRequestId,
+            PaymentMethodData[] methodData, PaymentItem total, PaymentDetailsModifier[] modifiers,
+            String instrumentKey, Object callback);
 }