Remove ContextLifecycleObserver from NavigatorServiceWorker

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

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 31 matching lines @@
 #include "modules/serviceworkers/ServiceWorkerRegistration.h"
 #include "platform/heap/Handle.h"
 #include "public/platform/modules/serviceworker/WebServiceWorkerProvider.h"
 #include "public/platform/modules/serviceworker/WebServiceWorkerProviderClient.h"
 #include "wtf/Forward.h"
 #include <memory>
 
 namespace blink {
 
 class ExecutionContext;
+class NavigatorServiceWorker;
 class WebServiceWorker;
 class WebServiceWorkerProvider;
 
 class MODULES_EXPORT ServiceWorkerContainer final
     : public EventTargetWithInlineData,
       public ContextLifecycleObserver,
       public WebServiceWorkerProviderClient {
   DEFINE_WRAPPERTYPEINFO();
   USING_GARBAGE_COLLECTED_MIXIN(ServiceWorkerContainer);
 
  public:
   using RegistrationCallbacks =
       WebServiceWorkerProvider::WebServiceWorkerRegistrationCallbacks;
 
-  static ServiceWorkerContainer* create(ExecutionContext*);
+  static ServiceWorkerContainer* create(ExecutionContext*,
+                                        NavigatorServiceWorker*);
   ~ServiceWorkerContainer();
 
   DECLARE_VIRTUAL_TRACE();
 
   ServiceWorker* controller() { return m_controller; }
   ScriptPromise ready(ScriptState*);
   WebServiceWorkerProvider* provider() { return m_provider; }
 
   void registerServiceWorkerImpl(ExecutionContext*,
                                  const KURL& scriptURL,
@@ skipping 18 matching lines @@
   // EventTarget overrides.
   ExecutionContext* getExecutionContext() const override {
     return ContextLifecycleObserver::getExecutionContext();
   }
   const AtomicString& interfaceName() const override;
 
   DEFINE_ATTRIBUTE_EVENT_LISTENER(controllerchange);
   DEFINE_ATTRIBUTE_EVENT_LISTENER(message);
 
  private:
-  explicit ServiceWorkerContainer(ExecutionContext*);
+  ServiceWorkerContainer(ExecutionContext*, NavigatorServiceWorker*);
 
   class GetRegistrationForReadyCallback;
   typedef ScriptPromiseProperty<Member<ServiceWorkerContainer>,
                                 Member<ServiceWorkerRegistration>,
                                 Member<ServiceWorkerRegistration>>
       ReadyProperty;
   ReadyProperty* createReadyProperty();
 
   WebServiceWorkerProvider* m_provider;
   Member<ServiceWorker> m_controller;
   Member<ReadyProperty> m_ready;
+  Member<NavigatorServiceWorker> m_navigator;
 };
 
 }  // namespace blink
 
 #endif  // ServiceWorkerContainer_h