Revert of Remove ContextLifecycleObserver from ScriptPromisePropertyBase

third_party/WebKit/Source/bindings/core/v8/ScriptPromisePropertyBase.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 ScriptPromisePropertyBase_h
 #define ScriptPromisePropertyBase_h
 
 #include "bindings/core/v8/ScopedPersistent.h"
 #include "bindings/core/v8/ScriptPromise.h"
 #include "bindings/core/v8/ScriptPromiseProperties.h"
 #include "core/CoreExport.h"
+#include "core/dom/ContextLifecycleObserver.h"
 #include "wtf/Compiler.h"
 #include "wtf/RefCounted.h"
 #include "wtf/Vector.h"
 #include <memory>
 #include <v8.h>
 
 namespace blink {
 
 class DOMWrapperWorld;
 class ExecutionContext;
 class ScriptState;
 
 // TODO(yhirano): Remove NEVER_INLINE once we find the cause of crashes.
 class CORE_EXPORT ScriptPromisePropertyBase
-    : public GarbageCollectedFinalized<ScriptPromisePropertyBase> {
+    : public GarbageCollectedFinalized<ScriptPromisePropertyBase>,
+      public ContextLifecycleObserver {
+  USING_GARBAGE_COLLECTED_MIXIN(ScriptPromisePropertyBase);
+
  public:
   virtual ~ScriptPromisePropertyBase();
 
   enum Name {
 #define P(Name) Name,
     SCRIPT_PROMISE_PROPERTIES(P)
 #undef P
   };
 
   enum State {
     Pending,
     Resolved,
     Rejected,
   };
   State getState() const { return m_state; }
-  ExecutionContext* getExecutionContext() const;
+
   ScriptPromise promise(DOMWrapperWorld&);
 
   DECLARE_VIRTUAL_TRACE();
 
  protected:
   ScriptPromisePropertyBase(ExecutionContext*, Name);
 
   void resolveOrReject(State targetState);
 
   // ScriptPromiseProperty overrides these to wrap the holder,
@@ skipping 21 matching lines @@
   void resolveOrRejectInternal(v8::Local<v8::Promise::Resolver>);
   v8::Local<v8::Object> ensureHolderWrapper(ScriptState*);
   NEVER_INLINE void clearWrappers();
   // TODO(yhirano): Remove these functions once we find the cause of crashes.
   NEVER_INLINE void checkThis();
   NEVER_INLINE void checkWrappers();
 
   v8::Local<v8::String> promiseName();
   v8::Local<v8::String> resolverName();
 
-  Member<ExecutionContext> m_executionContext;
   v8::Isolate* m_isolate;
   Name m_name;
   State m_state;
 
   WeakPersistentSet m_wrappers;
 };
 
 }  // namespace blink
 
 #endif  // ScriptPromisePropertyBase_h