ServiceWorker: Store the existence of fetch event handler

content/browser/service_worker/service_worker_register_job.cc

Index: content/browser/service_worker/service_worker_register_job.cc
diff --git a/content/browser/service_worker/service_worker_register_job.cc b/content/browser/service_worker/service_worker_register_job.cc
index 149502cddbd0e1e7bb1afe57312536b211c7c019..b90f3cf2f6bf1997d28aa68bc777c601179dde50 100644
--- a/content/browser/service_worker/service_worker_register_job.cc
+++ b/content/browser/service_worker/service_worker_register_job.cc
@@ -410,7 +410,7 @@ void ServiceWorkerRegisterJob::InstallAndContinue() {
       ServiceWorkerMetrics::EventType::INSTALL,
       base::Bind(&ServiceWorkerRegisterJob::DispatchInstallEvent,
                  weak_factory_.GetWeakPtr()),
-      base::Bind(&ServiceWorkerRegisterJob::OnInstallFinished,
+      base::Bind(&ServiceWorkerRegisterJob::OnInstallFailed,
                  weak_factory_.GetWeakPtr()));
 
   // A subsequent registration job may terminate our installing worker. It can
@@ -427,25 +427,41 @@ void ServiceWorkerRegisterJob::DispatchInstallEvent() {
       << "Worker stopped too soon after it was started.";
   int request_id = new_version()->StartRequest(
       ServiceWorkerMetrics::EventType::INSTALL,
+      base::Bind(&ServiceWorkerRegisterJob::OnInstallFailed,
+                 weak_factory_.GetWeakPtr()));
+  new_version()->DispatchEvent<ServiceWorkerHostMsg_InstallEventFinished>(
+      request_id, ServiceWorkerMsg_InstallEvent(request_id),
       base::Bind(&ServiceWorkerRegisterJob::OnInstallFinished,
                  weak_factory_.GetWeakPtr()));
-  new_version()->DispatchSimpleEvent<ServiceWorkerHostMsg_InstallEventFinished>(
-      request_id, ServiceWorkerMsg_InstallEvent(request_id));
 }
 
 void ServiceWorkerRegisterJob::OnInstallFinished(
-    ServiceWorkerStatusCode status) {
-  ServiceWorkerMetrics::RecordInstallEventStatus(status);
+    int request_id,
+    blink::WebServiceWorkerEventResult result,
+    bool has_fetch_handler) {
+  new_version()->FinishRequest(
+      request_id, result == blink::WebServiceWorkerEventResultCompleted);
+
+  ServiceWorkerStatusCode status = SERVICE_WORKER_ERROR_FAILED;
+  switch (result) {
+    case blink::WebServiceWorkerEventResultCompleted:
+      status = SERVICE_WORKER_OK;
+      break;
+    case blink::WebServiceWorkerEventResultRejected:
+      status = SERVICE_WORKER_ERROR_EVENT_WAITUNTIL_REJECTED;
+      break;

[falken, 2016/05/25 01:19:35]

default: NOTREACHED()

[shimazu, 2016/05/25 03:35:13]

Done.

+  }
 
   if (status != SERVICE_WORKER_OK) {
-    // "8. If installFailed is true, then:..."
-    Complete(status, std::string("ServiceWorker failed to install: ") +
-                         ServiceWorkerStatusToString(status));
+    OnInstallFailed(status);
     return;
   }
 
+  ServiceWorkerMetrics::RecordInstallEventStatus(status);
+
   SetPhase(STORE);
   DCHECK(!registration()->last_update_check().is_null());
+  new_version()->set_has_fetch_handler(has_fetch_handler);
   context_->storage()->StoreRegistration(
       registration(),
       new_version(),
@@ -453,6 +469,17 @@ void ServiceWorkerRegisterJob::OnInstallFinished(
                  weak_factory_.GetWeakPtr()));
 }
 
+void ServiceWorkerRegisterJob::OnInstallFailed(ServiceWorkerStatusCode status) {
+  ServiceWorkerMetrics::RecordInstallEventStatus(status);
+
+  if (status != SERVICE_WORKER_OK) {
+    Complete(status, std::string("ServiceWorker failed to install: ") +
+                         ServiceWorkerStatusToString(status));
+  } else {
+    NOTREACHED() << "OnInstallFailed should not handle SERVICE_WORKER_OK";
+  }
+}
+
 void ServiceWorkerRegisterJob::OnStoreRegistrationComplete(
     ServiceWorkerStatusCode status) {
   if (status != SERVICE_WORKER_OK) {