ServiceWorker: Store the existence of fetch event handler

content/browser/service_worker/service_worker_browsertest.cc

 // Copyright 2014 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 <stddef.h>
 #include <stdint.h>
 
 #include <map>
 #include <memory>
 #include <utility>
@@ skipping 633 matching lines @@
         base::Bind(&self::DispatchInstallEventOnIOThread, this, done, result),
         CreateReceiver(BrowserThread::UI, done, result));
   }
 
   void DispatchInstallEventOnIOThread(const base::Closure& done,
                                       ServiceWorkerStatusCode* result) {
     ASSERT_TRUE(BrowserThread::CurrentlyOn(BrowserThread::IO));
     int request_id =
         version_->StartRequest(ServiceWorkerMetrics::EventType::INSTALL,
                                CreateReceiver(BrowserThread::UI, done, result));
-    version_->DispatchSimpleEvent<ServiceWorkerHostMsg_InstallEventFinished>(
-        request_id, ServiceWorkerMsg_InstallEvent(request_id));
+    version_->DispatchEvent<ServiceWorkerHostMsg_InstallEventFinished>(
+        request_id, ServiceWorkerMsg_InstallEvent(request_id),
+        base::Bind(&self::ReceiveInstallEventOnIOThread, this, done, result));
+  }
+
+  void ReceiveInstallEventOnIOThread(const base::Closure& done,
+                                     ServiceWorkerStatusCode* out_result,
+                                     int request_id,
+                                     blink::WebServiceWorkerEventResult result,
+                                     bool has_fetch_handler) {
+    version_->FinishRequest(
+        request_id, result == blink::WebServiceWorkerEventResultCompleted);
+    version_->set_has_fetch_handler(has_fetch_handler);
+
+    ServiceWorkerStatusCode status = SERVICE_WORKER_OK;
+    if (result == blink::WebServiceWorkerEventResultRejected)
+      status = SERVICE_WORKER_ERROR_EVENT_WAITUNTIL_REJECTED;
+
+    *out_result = status;
+    if (!done.is_null())
+      BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, done);
   }
 
   void StoreOnIOThread(const base::Closure& done,
                        ServiceWorkerStatusCode* result,
                        int64_t version_id) {
     ASSERT_TRUE(BrowserThread::CurrentlyOn(BrowserThread::IO));
     ServiceWorkerVersion* version =
         wrapper()->context()->GetLiveVersion(version_id);
     wrapper()->context()->storage()->StoreRegistration(
         registration_.get(), version,
@@ skipping 193 matching lines @@
 IN_PROC_BROWSER_TEST_F(ServiceWorkerVersionBrowserTest, Install) {
   InstallTestHelper("/service_worker/worker.js", SERVICE_WORKER_OK);
 }
 
 IN_PROC_BROWSER_TEST_F(ServiceWorkerVersionBrowserTest,
                        InstallWithWaitUntil_Fulfilled) {
   InstallTestHelper("/service_worker/worker_install_fulfilled.js",
                     SERVICE_WORKER_OK);
 }
 
+IN_PROC_BROWSER_TEST_F(ServiceWorkerVersionBrowserTest,
+                       InstallWithFetchHandler) {
+  InstallTestHelper("/service_worker/fetch_event.js", SERVICE_WORKER_OK);
+  EXPECT_TRUE(version_->has_fetch_handler());
+}
+
+IN_PROC_BROWSER_TEST_F(ServiceWorkerVersionBrowserTest,
+                       InstallWithoutFetchHandler) {
+  InstallTestHelper("/service_worker/worker.js", SERVICE_WORKER_OK);
+  EXPECT_FALSE(version_->has_fetch_handler());
+}
+
 // Check that ServiceWorker script requests set a "Service-Worker: script"
 // header.
 IN_PROC_BROWSER_TEST_F(ServiceWorkerVersionBrowserTest,
                        ServiceWorkerScriptHeader) {
   embedded_test_server()->RegisterRequestHandler(
       base::Bind(&VerifyServiceWorkerHeaderInRequest));
   InstallTestHelper("/service_worker/generated_sw.js", SERVICE_WORKER_OK);
 }
 
 IN_PROC_BROWSER_TEST_F(ServiceWorkerVersionBrowserTest,
@@ skipping 955 matching lines @@
   NavigateToTestPage();
   // The V8 code cache must be stored to the CacheStorage which must be bigger
   // than 12 byte.
   EXPECT_GT(GetSideDataSize(), kV8CacheTimeStampDataSize);
 
   NavigateToTestPage();
   EXPECT_GT(GetSideDataSize(), kV8CacheTimeStampDataSize);
 }
 
 }  // namespace content