| Index: content/renderer/service_worker/service_worker_context_client.cc
|
| diff --git a/content/renderer/service_worker/service_worker_context_client.cc b/content/renderer/service_worker/service_worker_context_client.cc
|
| index 666555e87bb6868067f78ba94f01d11c1c59d0d3..58861f4e57772dec2ba8b5e5d07a2dbb71b5aed2 100644
|
| --- a/content/renderer/service_worker/service_worker_context_client.cc
|
| +++ b/content/renderer/service_worker/service_worker_context_client.cc
|
| @@ -65,8 +65,8 @@
|
| #include "third_party/WebKit/public/platform/WebURLResponse.h"
|
| #include "third_party/WebKit/public/platform/modules/background_fetch/WebBackgroundFetchSettledFetch.h"
|
| #include "third_party/WebKit/public/platform/modules/notifications/WebNotificationData.h"
|
| -#include "third_party/WebKit/public/platform/modules/payments/WebPaymentAppRequest.h"
|
| #include "third_party/WebKit/public/platform/modules/payments/WebPaymentAppResponse.h"
|
| +#include "third_party/WebKit/public/platform/modules/payments/WebPaymentRequestEventData.h"
|
| #include "third_party/WebKit/public/platform/modules/serviceworker/WebServiceWorkerClientQueryOptions.h"
|
| #include "third_party/WebKit/public/platform/modules/serviceworker/WebServiceWorkerError.h"
|
| #include "third_party/WebKit/public/platform/modules/serviceworker/WebServiceWorkerNetworkProvider.h"
|
| @@ -1215,7 +1215,7 @@ void ServiceWorkerContextClient::DispatchSyncEvent(
|
|
|
| void ServiceWorkerContextClient::DispatchPaymentRequestEvent(
|
| int payment_request_id,
|
| - payments::mojom::PaymentAppRequestPtr app_request,
|
| + payments::mojom::PaymentRequestEventDataPtr eventData,
|
| payments::mojom::PaymentAppResponseCallbackPtr response_callback,
|
| DispatchPaymentRequestEventCallback callback) {
|
| TRACE_EVENT0("ServiceWorker",
|
| @@ -1225,9 +1225,9 @@ void ServiceWorkerContextClient::DispatchPaymentRequestEvent(
|
| context_->payment_request_event_callbacks.insert(
|
| std::make_pair(payment_request_id, std::move(callback)));
|
|
|
| - blink::WebPaymentAppRequest webAppRequest =
|
| - mojo::ConvertTo<blink::WebPaymentAppRequest>(std::move(app_request));
|
| - proxy_->DispatchPaymentRequestEvent(payment_request_id, webAppRequest);
|
| + blink::WebPaymentRequestEventData webEventData =
|
| + mojo::ConvertTo<blink::WebPaymentRequestEventData>(std::move(eventData));
|
| + proxy_->DispatchPaymentRequestEvent(payment_request_id, webEventData);
|
| }
|
|
|
| void ServiceWorkerContextClient::Send(IPC::Message* message) {
|
|
|