Index: content/browser/service_worker/service_worker_browsertest.cc |
diff --git a/content/browser/service_worker/service_worker_browsertest.cc b/content/browser/service_worker/service_worker_browsertest.cc |
index 531f5bde7db3f7f512ba88769a105406cadff476..faeb59637c37116e441634793f1c1a6ebb0ad57c 100644 |
--- a/content/browser/service_worker/service_worker_browsertest.cc |
+++ b/content/browser/service_worker/service_worker_browsertest.cc |
@@ -796,32 +796,27 @@ class ServiceWorkerVersionBrowserTest : public ServiceWorkerBrowserTest { |
int request_id = |
version_->StartRequest(ServiceWorkerMetrics::EventType::INSTALL, |
CreateReceiver(BrowserThread::UI, done, result)); |
- version_ |
- ->RegisterRequestCallback<ServiceWorkerHostMsg_InstallEventFinished>( |
- request_id, base::Bind(&self::ReceiveInstallEventOnIOThread, |
- base::Unretained(this), done, result)); |
- version_->DispatchEvent({request_id}, |
- ServiceWorkerMsg_InstallEvent(request_id)); |
+ mojom::ServiceWorkerInstallEventMethodsAssociatedPtrInfo ptr_info; |
+ mojo::MakeRequest(&ptr_info); |
+ version_->event_dispatcher()->DispatchInstallEvent( |
+ std::move(ptr_info), |
+ base::Bind(&self::ReceiveInstallEventOnIOThread, base::Unretained(this), |
+ done, result, request_id)); |
} |
void ReceiveInstallEventOnIOThread(const base::Closure& done, |
ServiceWorkerStatusCode* out_result, |
int request_id, |
- blink::WebServiceWorkerEventResult result, |
+ ServiceWorkerStatusCode status, |
bool has_fetch_handler, |
base::Time dispatch_event_time) { |
- version_->FinishRequest( |
- request_id, result == blink::kWebServiceWorkerEventResultCompleted, |
- dispatch_event_time); |
+ version_->FinishRequest(request_id, status == SERVICE_WORKER_OK, |
+ dispatch_event_time); |
version_->set_fetch_handler_existence( |
has_fetch_handler |
? ServiceWorkerVersion::FetchHandlerExistence::EXISTS |
: ServiceWorkerVersion::FetchHandlerExistence::DOES_NOT_EXIST); |
- ServiceWorkerStatusCode status = SERVICE_WORKER_OK; |
- if (result == blink::kWebServiceWorkerEventResultRejected) |
- status = SERVICE_WORKER_ERROR_EVENT_WAITUNTIL_REJECTED; |
- |
*out_result = status; |
if (!done.is_null()) |
BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, done); |