ServiceWorker: Keep the worker alive until FetchEvent.waitUntil settles

content/browser/service_worker/service_worker_version.cc

Index: content/browser/service_worker/service_worker_version.cc
diff --git a/content/browser/service_worker/service_worker_version.cc b/content/browser/service_worker/service_worker_version.cc
index 470bc86f5ee2b94066316433b3d34c1670103fe0..e803472c401360116f27ae35b75a56636ee445c5 100644
--- a/content/browser/service_worker/service_worker_version.cc
+++ b/content/browser/service_worker/service_worker_version.cc
@@ -566,6 +566,28 @@ void ServiceWorkerVersion::RunAfterStartWorker(
                          error_callback, task));
 }
 
+void ServiceWorkerVersion::DispatchEvent(const std::vector<int>& request_ids,
+                                         const IPC::Message& message) {
+  DCHECK_EQ(RUNNING, running_status());
+
+  const ServiceWorkerStatusCode status = embedded_worker_->SendMessage(message);
+
+  for (int request_id : request_ids) {
+    PendingRequest<StatusCallback>* request =
+        custom_requests_.Lookup(request_id);
+    DCHECK(request) << "Invalid request id";
+    DCHECK(!request->is_dispatched)
+        << "Request already dispatched an IPC event";
+    if (status != SERVICE_WORKER_OK) {
+      base::ThreadTaskRunnerHandle::Get()->PostTask(

[Marijn Kruisselbrink, 2016/06/15 12:37:07]

Now this code is in the .cc file you could use RunSoon rather than the explicit
base::ThreadTaskRunnerHandle::Get()->PostTask() thing.

[shimazu, 2016/06/21 02:43:38]

Done.

+          FROM_HERE, base::Bind(request->callback, status));
+      custom_requests_.Remove(request_id);
+    } else {
+      request->is_dispatched = true;
+    }
+  }
+}
+
 void ServiceWorkerVersion::AddControllee(
     ServiceWorkerProviderHost* provider_host) {
   const std::string& uuid = provider_host->client_uuid();