Remove ContextLifecycleObserver from WaitUntilObserver

third_party/WebKit/Source/modules/serviceworkers/WaitUntilObserver.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 WaitUntilObserver_h
 #define WaitUntilObserver_h
 
-#include "core/dom/ContextLifecycleObserver.h"
 #include "modules/ModulesExport.h"
 #include "modules/serviceworkers/ServiceWorkerGlobalScopeClient.h"
 #include "platform/Timer.h"
 #include "wtf/Forward.h"
 
 namespace blink {
 
 class ExceptionState;
 class ExecutionContext;
 class ScriptPromise;
 class ScriptState;
 class ScriptValue;
 
 // Created for each ExtendableEvent instance.
 class MODULES_EXPORT WaitUntilObserver final
-    : public GarbageCollectedFinalized<WaitUntilObserver>,
-      public ContextLifecycleObserver {
-  USING_GARBAGE_COLLECTED_MIXIN(WaitUntilObserver);
-
+    : public GarbageCollectedFinalized<WaitUntilObserver> {
  public:
   enum EventType {
     Activate,
     Fetch,
     Install,
     Message,
     NotificationClick,
     NotificationClose,
     PaymentRequest,
     Push,
@@ skipping 23 matching lines @@
  private:
   friend class InternalsServiceWorker;
   class ThenFunction;
 
   WaitUntilObserver(ExecutionContext*, EventType, int eventID);
 
   void reportError(const ScriptValue&);
 
   void consumeWindowInteraction(TimerBase*);
 
+  Member<ExecutionContext> m_executionContext;
   EventType m_type;
   int m_eventID;
   int m_pendingActivity = 0;
   bool m_hasError = false;
   bool m_eventDispatched = false;
   double m_eventDispatchTime = 0;
   Timer<WaitUntilObserver> m_consumeWindowInteractionTimer;
 };
 
 }  // namespace blink
 
 #endif  // WaitUntilObserver_h