Revert 166694 "Move serviceworker/ module to oilpan"

trunk/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 "heap/Handle.h"
 #include "modules/serviceworkers/ServiceWorkerGlobalScopeClient.h"
 #include "wtf/Forward.h"
 #include "wtf/RefCounted.h"
 
 namespace WebCore {
 
 class ExecutionContext;
 class ScriptValue;
 
 // Created for each InstallPhaseEvent instance.
 class WaitUntilObserver FINAL :
-    public RefCountedWillBeGarbageCollectedFinalized<WaitUntilObserver>,
-    public ContextLifecycleObserver {
-    DECLARE_GC_INFO;
+    public ContextLifecycleObserver,
+    public RefCounted<WaitUntilObserver> {
 public:
-    static PassRefPtrWillBeRawPtr<WaitUntilObserver> create(ExecutionContext*, int eventID);
+    static PassRefPtr<WaitUntilObserver> create(ExecutionContext*, int eventID);
 
     ~WaitUntilObserver();
 
     // Must be called before and after dispatching the event.
     void willDispatchEvent();
     void didDispatchEvent();
 
     // Observes the promise and delays calling didHandleInstallEvent() until
     // the given promise is resolved or rejected.
     void waitUntil(const ScriptValue&);
 
-    void trace(Visitor*) { }
-
 private:
     class ThenFunction;
 
     WaitUntilObserver(ExecutionContext*, int eventID);
 
     void reportError(const ScriptValue&);
 
     void incrementPendingActivity();
     void decrementPendingActivity();
 
     int m_eventID;
     int m_pendingActivity;
 };
 
 } // namespace WebCore
 
 #endif // WaitUntilObserver_h