Revert r189385 "Remove LifecycleContext" and r189391, r189530, r189456 that block it

Source/modules/serviceworkers/WaitUntilObserver.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 "config.h"
 #include "modules/serviceworkers/WaitUntilObserver.h"
 
 #include "bindings/core/v8/ScriptFunction.h"
 #include "bindings/core/v8/ScriptPromise.h"
 #include "bindings/core/v8/ScriptValue.h"
@@ skipping 74 matching lines @@
 {
     if (m_eventDispatched) {
         exceptionState.throwDOMException(InvalidStateError, "The event handler is already finished.");
         return;
     }
 
     if (!executionContext())
         return;
 
     // When handling a notificationclick event, we want to allow one window to
-    // be focused or opened. Regardless of whether such action happened,
-    // |consumeWindowInteraction| will be called when all the pending activities
-    // will be resolved or after a
-    if (m_type == NotificationClick) {
-        executionContext()->allowWindowInteraction();
-        m_consumeWindowInteractionTimer.startOneShot(ServiceWorkerGlobalScope::kWindowInteractionTimeout, FROM_HERE);
-    }
+    // be focused. Regardless of whether one window was focused,
+    // |consumeWindowFocus| will be called when all the pending activities will
+    // be resolved.
+    if (m_type == NotificationClick)
+        executionContext()->allowWindowFocus();
 
     incrementPendingActivity();
     ScriptPromise::cast(scriptState, value).then(
         ThenFunction::createFunction(scriptState, this, ThenFunction::Fulfilled),
         ThenFunction::createFunction(scriptState, this, ThenFunction::Rejected));
 }
 
 WaitUntilObserver::WaitUntilObserver(ExecutionContext* context, EventType type, int eventID)
     : ContextLifecycleObserver(context)
     , m_type(type)
     , m_eventID(eventID)
     , m_pendingActivity(0)
     , m_hasError(false)
     , m_eventDispatched(false)
-    , m_consumeWindowInteractionTimer(this, &WaitUntilObserver::consumeWindowInteraction)
 {
 }
 
 void WaitUntilObserver::reportError(const ScriptValue& value)
 {
     // FIXME: Propagate error message to the client for onerror handling.
     notImplemented();
 
     m_hasError = true;
 }
@@ skipping 13 matching lines @@
     WebServiceWorkerEventResult result = m_hasError ? WebServiceWorkerEventResultRejected : WebServiceWorkerEventResultCompleted;
     switch (m_type) {
     case Activate:
         client->didHandleActivateEvent(m_eventID, result);
         break;
     case Install:
         client->didHandleInstallEvent(m_eventID, result);
         break;
     case NotificationClick:
         client->didHandleNotificationClickEvent(m_eventID, result);
-        m_consumeWindowInteractionTimer.stop();
-        consumeWindowInteraction(nullptr);
+        executionContext()->consumeWindowFocus();
         break;
     case Push:
         client->didHandlePushEvent(m_eventID, result);
         break;
     }
-    setContext(nullptr);
-}
-
-void WaitUntilObserver::consumeWindowInteraction(Timer<WaitUntilObserver>*)
-{
-    if (!executionContext())
-        return;
-    executionContext()->consumeWindowInteraction();
+    observeContext(0);
 }
 
 void WaitUntilObserver::trace(Visitor* visitor)
 {
     ContextLifecycleObserver::trace(visitor);
 }
 
 } // namespace blink