Revert of Remove DOMWindowProperty::willDetachGlobalObjectFromFrame

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

 // 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.
 
 #ifndef NavigatorServiceWorker_h
 #define NavigatorServiceWorker_h
 
-#include "core/dom/ContextLifecycleObserver.h"
 #include "core/frame/Navigator.h"
 #include "modules/ModulesExport.h"
 #include "platform/Supplementable.h"
 #include "platform/heap/Handle.h"
 
 namespace blink {
 
 class Document;
 class ExceptionState;
 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&);
     static NavigatorServiceWorker& from(Navigator&);
     static NavigatorServiceWorker* toNavigatorServiceWorker(Navigator&);
     static ServiceWorkerContainer* serviceWorker(ExecutionContext*, Navigator&, ExceptionState&);
 
     DECLARE_VIRTUAL_TRACE();
 
 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;
 };
 
 } // namespace blink
 
 #endif // NavigatorServiceWorker_h