Extract simpler classes for observing context lifecycle and observe Page lifecycle inNavigatorVibra…

Source/core/dom/ScriptExecutionContext.h

Index: Source/core/dom/ScriptExecutionContext.h
diff --git a/Source/core/dom/ScriptExecutionContext.h b/Source/core/dom/ScriptExecutionContext.h
index ea1759a0f5f21b6e1241f15742acc11b9b0b0ab1..a24433bc6bafa7ef1c467b88c00a7154ce7a3594 100644
--- a/Source/core/dom/ScriptExecutionContext.h
+++ b/Source/core/dom/ScriptExecutionContext.h
@@ -30,6 +30,7 @@
 
 #include "core/dom/ActiveDOMObject.h"
 #include "core/dom/SecurityContext.h"
+#include "core/dom/SimpleLifecycleContext.h"
 #include "core/page/ConsoleTypes.h"
 #include "core/platform/Supplementable.h"
 #include "weborigin/KURL.h"
@@ -49,7 +50,7 @@ class PublicURLManager;
 class ScriptCallStack;
 class ScriptState;
 
-class ScriptExecutionContext : public SecurityContext, public Supplementable<ScriptExecutionContext> {
+class ScriptExecutionContext : public SimpleLifecycleContext, public SecurityContext, public Supplementable<ScriptExecutionContext> {
 public:
     ScriptExecutionContext();
     virtual ~ScriptExecutionContext();
@@ -57,7 +58,6 @@ public:
     virtual bool isDocument() const { return false; }
     virtual bool isWorkerGlobalScope() const { return false; }
 
-    virtual bool isContextThread() const { return true; }
     virtual bool isJSExecutionForbidden() const = 0;
 
     const KURL& url() const { return virtualURL(); }
@@ -93,10 +93,6 @@ public:
     // Called after the construction of an ActiveDOMObject to synchronize suspend state.
     void suspendActiveDOMObjectIfNeeded(ActiveDOMObject*);
 
-    // Called from the constructor and destructors of ContextLifecycleObserver
-    void wasObservedBy(ContextLifecycleObserver*, ContextLifecycleObserver::Type as);
-    void wasUnobservedBy(ContextLifecycleObserver*, ContextLifecycleObserver::Type as);
-
     // MessagePort is conceptually a kind of ActiveDOMObject, but it needs to be tracked separately for message dispatch.
     void processMessagePortMessagesSoon();
     void dispatchMessagePortEvents();
@@ -171,9 +167,8 @@ private:
 
     virtual void refScriptExecutionContext() = 0;
     virtual void derefScriptExecutionContext() = 0;
-    virtual PassOwnPtr<ContextLifecycleNotifier> createLifecycleNotifier();
+    virtual PassOwnPtr<SimpleLifecycleNotifier> createLifecycleNotifier() OVERRIDE;
 
-    OwnPtr<ContextLifecycleNotifier> m_lifecycleNotifier;
     HashSet<MessagePort*> m_messagePorts;
 
     int m_circularSequentialID;