Revert of Remove DOMWindowProperty::willDetachGlobalObjectFromFrame

third_party/WebKit/Source/modules/serviceworkers/NavigatorServiceWorker.h

Index: third_party/WebKit/Source/modules/serviceworkers/NavigatorServiceWorker.h
diff --git a/third_party/WebKit/Source/modules/serviceworkers/NavigatorServiceWorker.h b/third_party/WebKit/Source/modules/serviceworkers/NavigatorServiceWorker.h
index 9d8584e731c76b9c9313dac76f24b1e63c9da323..ebcb21b8d280358e8827a9e698b49034d63ab95e 100644
--- a/third_party/WebKit/Source/modules/serviceworkers/NavigatorServiceWorker.h
+++ b/third_party/WebKit/Source/modules/serviceworkers/NavigatorServiceWorker.h
@@ -5,7 +5,6 @@
 #ifndef NavigatorServiceWorker_h
 #define NavigatorServiceWorker_h
 
-#include "core/dom/ContextLifecycleObserver.h"
 #include "core/frame/Navigator.h"
 #include "modules/ModulesExport.h"
 #include "platform/Supplementable.h"
@@ -18,7 +17,7 @@
 class Navigator;
 class ServiceWorkerContainer;
 
-class MODULES_EXPORT NavigatorServiceWorker final : public GarbageCollected<NavigatorServiceWorker>, public Supplement<Navigator>, public ContextLifecycleObserver {
+class MODULES_EXPORT NavigatorServiceWorker final : public GarbageCollected<NavigatorServiceWorker>, public Supplement<Navigator>, public DOMWindowProperty {
     USING_GARBAGE_COLLECTED_MIXIN(NavigatorServiceWorker);
 public:
     static NavigatorServiceWorker* from(Document&);
@@ -30,12 +29,12 @@
 
 private:
     explicit NavigatorServiceWorker(Navigator&);
-    ServiceWorkerContainer* serviceWorker(LocalFrame*, ExceptionState&);
+    ServiceWorkerContainer* serviceWorker(ExceptionState&);
 
     static const char* supplementName();
 
-    // ContextLifecycleObserver override.
-    void contextDestroyed() override;
+    // DOMWindowProperty override.
+    void willDetachGlobalObjectFromFrame() override;
 
     Member<ServiceWorkerContainer> m_serviceWorker;
 };