ServiceWorker: Keep the worker alive until FetchEvent.waitUntil settles

third_party/WebKit/Source/modules/serviceworkers/FetchEvent.cpp

Index: third_party/WebKit/Source/modules/serviceworkers/FetchEvent.cpp
diff --git a/third_party/WebKit/Source/modules/serviceworkers/FetchEvent.cpp b/third_party/WebKit/Source/modules/serviceworkers/FetchEvent.cpp
index 5346f5580750c5b11f3fcaa28f3ea02678a5797c..47bf72a9f6bae25a26d291c738e373a9031403ef 100644
--- a/third_party/WebKit/Source/modules/serviceworkers/FetchEvent.cpp
+++ b/third_party/WebKit/Source/modules/serviceworkers/FetchEvent.cpp
@@ -19,12 +19,12 @@ FetchEvent* FetchEvent::create()
 
 FetchEvent* FetchEvent::create(ScriptState* scriptState, const AtomicString& type, const FetchEventInit& initializer)
 {
-    return new FetchEvent(scriptState, type, initializer, nullptr);
+    return new FetchEvent(scriptState, type, initializer, nullptr, nullptr);
 }
 
-FetchEvent* FetchEvent::create(ScriptState* scriptState, const AtomicString& type, const FetchEventInit& initializer, RespondWithObserver* observer)
+FetchEvent* FetchEvent::create(ScriptState* scriptState, const AtomicString& type, const FetchEventInit& initializer, RespondWithObserver* respondWithObserver, WaitUntilObserver* waitUntilObserver)
 {
-    return new FetchEvent(scriptState, type, initializer, observer);
+    return new FetchEvent(scriptState, type, initializer, respondWithObserver, waitUntilObserver);
 }
 
 Request* FetchEvent::request() const
@@ -59,9 +59,9 @@ FetchEvent::FetchEvent()
 {
 }
 
-FetchEvent::FetchEvent(ScriptState* scriptState, const AtomicString& type, const FetchEventInit& initializer, RespondWithObserver* observer)
-    : ExtendableEvent(type, initializer)
-    , m_observer(observer)
+FetchEvent::FetchEvent(ScriptState* scriptState, const AtomicString& type, const FetchEventInit& initializer, RespondWithObserver* respondWithObserver, WaitUntilObserver* waitUntilObserver)
+    : ExtendableEvent(type, initializer, waitUntilObserver)
+    , m_observer(respondWithObserver)
 {
     m_clientId = initializer.clientId();
     m_isReload = initializer.isReload();