Remove ContextLifecycleObserver from NavigatorServiceWorker

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

 // 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 "modules/serviceworkers/NavigatorServiceWorker.h"
 
 #include "core/dom/Document.h"
 #include "core/frame/LocalDOMWindow.h"
 #include "core/frame/LocalFrame.h"
 #include "core/frame/Navigator.h"
 #include "modules/serviceworkers/ServiceWorkerContainer.h"
 
 namespace blink {
 
-NavigatorServiceWorker::NavigatorServiceWorker(Navigator& navigator)
-    : ContextLifecycleObserver(navigator.frame() ? navigator.frame()->document()
-                                                 : nullptr) {}
+NavigatorServiceWorker::NavigatorServiceWorker(Navigator& navigator) {}
 
 NavigatorServiceWorker* NavigatorServiceWorker::from(Document& document) {
   if (!document.frame() || !document.frame()->domWindow())
     return nullptr;
   Navigator& navigator = *document.frame()->domWindow()->navigator();
   return &from(navigator);
 }
 
 NavigatorServiceWorker& NavigatorServiceWorker::from(Navigator& navigator) {
   NavigatorServiceWorker* supplement = toNavigatorServiceWorker(navigator);
@@ skipping 70 matching lines @@
     } else if (frame->securityContext()->getSecurityOrigin()->hasSuborigin()) {
       errorMessage =
           "Service worker is disabled because the context is in a suborigin.";
     } else {
       errorMessage =
           "Access to service workers is denied in this document origin.";
     }
     return nullptr;
   }
   if (!m_serviceWorker && frame) {
+    // We need to create a new ServiceWorkerContainer when the frame
+    // navigates to a new document. In practice, this happens only when the
+    // frame navigates from the initial empty page to a new same-origin page.
     DCHECK(frame->domWindow());
     m_serviceWorker = ServiceWorkerContainer::create(
-        frame->domWindow()->getExecutionContext());
+        frame->domWindow()->getExecutionContext(), this);
   }
   return m_serviceWorker.get();
 }
 
-void NavigatorServiceWorker::contextDestroyed() {
+void NavigatorServiceWorker::clearServiceWorker() {
   m_serviceWorker = nullptr;
 }
 
 DEFINE_TRACE(NavigatorServiceWorker) {
   visitor->trace(m_serviceWorker);
   Supplement<Navigator>::trace(visitor);
-  ContextLifecycleObserver::trace(visitor);
 }
 
 }  // namespace blink