PaymentHandler: Rename PaymentAppRequest with PaymentRequestEventData.

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"
 #include "base/android/scoped_java_ref.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "components/payments/mojom/payment_app.mojom.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/payment_app_provider.h"
 #include "content/public/browser/stored_payment_instrument.h"
 #include "content/public/browser/web_contents.h"
 #include "jni/ServiceWorkerPaymentAppBridge_jni.h"
 
 namespace {
 
 using ::base::android::AttachCurrentThread;
 using ::base::android::ConvertJavaStringToUTF8;
 using ::base::android::ConvertUTF8ToJavaString;
 using ::base::android::JavaParamRef;
 using ::base::android::JavaRef;
 using ::base::android::ScopedJavaGlobalRef;
 using ::base::android::ScopedJavaLocalRef;
 using ::base::android::ToJavaArrayOfStrings;
-using ::payments::mojom::PaymentAppRequest;
-using ::payments::mojom::PaymentAppRequestPtr;
+using ::payments::mojom::PaymentRequestEventData;
+using ::payments::mojom::PaymentRequestEventDataPtr;
 using ::payments::mojom::PaymentCurrencyAmount;
 using ::payments::mojom::PaymentDetailsModifier;
 using ::payments::mojom::PaymentDetailsModifierPtr;
 using ::payments::mojom::PaymentItem;
 using ::payments::mojom::PaymentMethodData;
 using ::payments::mojom::PaymentMethodDataPtr;
 
 void OnGotAllPaymentApps(const JavaRef<jobject>& jweb_contents,
                          const JavaRef<jobject>& jcallback,
                          content::PaymentAppProvider::PaymentApps apps) {
@@ skipping 52 matching lines @@
     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();
+  PaymentRequestEventDataPtr event_data = PaymentRequestEventData::New();
 
-  app_request->top_level_origin =
+  event_data->top_level_origin =
       GURL(ConvertJavaStringToUTF8(env, jtop_level_origin));
-  app_request->payment_request_origin =
+  event_data->payment_request_origin =
       GURL(ConvertJavaStringToUTF8(env, jpayment_request_origin));
-  app_request->payment_request_id =
+  event_data->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(),
         &methodData->supported_methods);
     methodData->stringified_data = ConvertJavaStringToUTF8(
         env,
         Java_ServiceWorkerPaymentAppBridge_getStringifiedDataFromMethodData(
             env, element));
-    app_request->method_data.push_back(std::move(methodData));
+    event_data->method_data.push_back(std::move(methodData));
   }
 
-  app_request->total = PaymentItem::New();
-  app_request->total->label = ConvertJavaStringToUTF8(
+  event_data->total = PaymentItem::New();
+  event_data->total->label = ConvertJavaStringToUTF8(
       env,
       Java_ServiceWorkerPaymentAppBridge_getLabelFromPaymentItem(env, jtotal));
-  app_request->total->amount = PaymentCurrencyAmount::New();
-  app_request->total->amount->currency = ConvertJavaStringToUTF8(
+  event_data->total->amount = PaymentCurrencyAmount::New();
+  event_data->total->amount->currency = ConvertJavaStringToUTF8(
       env, Java_ServiceWorkerPaymentAppBridge_getCurrencyFromPaymentItem(
                env, jtotal));
-  app_request->total->amount->value = ConvertJavaStringToUTF8(
+  event_data->total->amount->value = ConvertJavaStringToUTF8(
       env,
       Java_ServiceWorkerPaymentAppBridge_getValueFromPaymentItem(env, jtotal));
 
   for (jsize i = 0; i < env->GetArrayLength(jmodifiers); i++) {
     ScopedJavaLocalRef<jobject> jmodifier(
         env, env->GetObjectArrayElement(jmodifiers, i));
     PaymentDetailsModifierPtr modifier = PaymentDetailsModifier::New();
 
     ScopedJavaLocalRef<jobject> jtotal =
         Java_ServiceWorkerPaymentAppBridge_getTotalFromModifier(env, jmodifier);
@@ skipping 17 matching lines @@
         env,
         Java_ServiceWorkerPaymentAppBridge_getSupportedMethodsFromMethodData(
             env, jmodifier_method_data)
             .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));
+    event_data->modifiers.push_back(std::move(modifier));
   }
 
-  app_request->instrument_key = ConvertJavaStringToUTF8(env, jinstrument_key);
+  event_data->instrument_key = ConvertJavaStringToUTF8(env, jinstrument_key);
 
   content::PaymentAppProvider::GetInstance()->InvokePaymentApp(
-      web_contents->GetBrowserContext(), registration_id,
-      std::move(app_request),
+      web_contents->GetBrowserContext(), registration_id, std::move(event_data),
       base::Bind(&OnPaymentAppInvoked,
                  ScopedJavaGlobalRef<jobject>(env, jweb_contents),
                  ScopedJavaGlobalRef<jobject>(env, jcallback)));
 }
 
 bool RegisterServiceWorkerPaymentAppBridge(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }