PaymentHandler: Merge PaymentAppRequest and PaymentRequestEvent.

chrome/browser/android/payments/service_worker_payment_app_bridge.cc

 // 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.
 
 #include "chrome/browser/android/payments/service_worker_payment_app_bridge.h"
 
 #include <utility>
 
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
@@ skipping 67 matching lines @@
   content::WebContents* web_contents =
       content::WebContents::FromJavaWebContents(jweb_contents);
 
   content::PaymentAppProvider::GetInstance()->GetAllPaymentApps(
       web_contents->GetBrowserContext(),
       base::Bind(&OnGotAllPaymentApps,
                  ScopedJavaGlobalRef<jobject>(env, jweb_contents),
                  ScopedJavaGlobalRef<jobject>(env, jcallback)));
 }
 
-static void InvokePaymentApp(JNIEnv* env,
-                             const JavaParamRef<jclass>& jcaller,
-                             const JavaParamRef<jobject>& jweb_contents,
-                             jlong registration_id,
-                             const JavaParamRef<jstring>& joption_id,
-                             const JavaParamRef<jstring>& jorigin,
-                             const JavaParamRef<jobjectArray>& jmethod_data,
-                             const JavaParamRef<jobject>& jtotal,
-                             const JavaParamRef<jobjectArray>& jmodifiers,
-                             const JavaParamRef<jobject>& jcallback) {
+static void InvokePaymentApp(
+    JNIEnv* env,
+    const JavaParamRef<jclass>& jcaller,
+    const JavaParamRef<jobject>& jweb_contents,
+    jlong registration_id,
+    const JavaParamRef<jstring>& jtop_level_origin,
+    const JavaParamRef<jstring>& jpayment_request_origin,
+    const JavaParamRef<jstring>& jpayment_request_id,
+    const JavaParamRef<jobjectArray>& jmethod_data,
+    const JavaParamRef<jobject>& jtotal,
+    const JavaParamRef<jobjectArray>& jmodifiers,
+    const JavaParamRef<jstring>& jinstrument_key,
+    const JavaParamRef<jobject>& jcallback) {
   content::WebContents* web_contents =
       content::WebContents::FromJavaWebContents(jweb_contents);
 
   PaymentAppRequestPtr app_request = PaymentAppRequest::New();
 
-  app_request->option_id = ConvertJavaStringToUTF8(env, joption_id);
-  app_request->origin = GURL(ConvertJavaStringToUTF8(env, jorigin));
+  app_request->top_level_origin =
+      GURL(ConvertJavaStringToUTF8(env, jtop_level_origin));
+  app_request->payment_request_origin =
+      GURL(ConvertJavaStringToUTF8(env, jpayment_request_origin));
+  app_request->payment_request_id =
+      ConvertJavaStringToUTF8(env, jpayment_request_id);
 
   for (jsize i = 0; i < env->GetArrayLength(jmethod_data); i++) {
     ScopedJavaLocalRef<jobject> element(
         env, env->GetObjectArrayElement(jmethod_data, i));
     PaymentMethodDataPtr methodData = PaymentMethodData::New();
     base::android::AppendJavaStringArrayToStringVector(
         env,
         Java_ServiceWorkerPaymentAppBridge_getSupportedMethodsFromMethodData(
             env, element)
             .obj(),
@@ skipping 47 matching lines @@
             .obj(),
         &modifier->method_data->supported_methods);
     modifier->method_data->stringified_data = ConvertJavaStringToUTF8(
         env,
         Java_ServiceWorkerPaymentAppBridge_getStringifiedDataFromMethodData(
             env, jmodifier_method_data));
 
     app_request->modifiers.push_back(std::move(modifier));
   }
 
+  app_request->instrument_key = ConvertJavaStringToUTF8(env, jinstrument_key);
+
   content::PaymentAppProvider::GetInstance()->InvokePaymentApp(
       web_contents->GetBrowserContext(), registration_id,
       std::move(app_request),
       base::Bind(&OnPaymentAppInvoked,
                  ScopedJavaGlobalRef<jobject>(env, jweb_contents),
                  ScopedJavaGlobalRef<jobject>(env, jcallback)));
 }
 
 bool RegisterServiceWorkerPaymentAppBridge(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }