Revert 166694 "Move serviceworker/ module to oilpan"

trunk/Source/modules/serviceworkers/WaitUntilObserver.cpp

Index: trunk/Source/modules/serviceworkers/WaitUntilObserver.cpp
===================================================================
--- trunk/Source/modules/serviceworkers/WaitUntilObserver.cpp	(revision 166772)
+++ trunk/Source/modules/serviceworkers/WaitUntilObserver.cpp	(working copy)
@@ -16,8 +16,6 @@
 
 namespace WebCore {
 
-DEFINE_GC_INFO(WaitUntilObserver);
-
 class WaitUntilObserver::ThenFunction FINAL : public ScriptFunction {
 public:
     enum ResolveType {
@@ -25,13 +23,13 @@
         Rejected,
     };
 
-    static PassOwnPtr<ScriptFunction> create(PassRefPtrWillBeRawPtr<WaitUntilObserver> observer, ResolveType type)
+    static PassOwnPtr<ScriptFunction> create(PassRefPtr<WaitUntilObserver> observer, ResolveType type)
     {
         return adoptPtr(new ThenFunction(toIsolate(observer->executionContext()), observer, type));
     }
 
 private:
-    ThenFunction(v8::Isolate* isolate, PassRefPtrWillBeRawPtr<WaitUntilObserver> observer, ResolveType type)
+    ThenFunction(v8::Isolate* isolate, PassRefPtr<WaitUntilObserver> observer, ResolveType type)
         : ScriptFunction(isolate)
         , m_observer(observer)
         , m_resolveType(type)
@@ -49,13 +47,13 @@
         return value;
     }
 
-    RefPtrWillBePersistent<WaitUntilObserver> m_observer;
+    RefPtr<WaitUntilObserver> m_observer;
     ResolveType m_resolveType;
 };
 
-PassRefPtrWillBeRawPtr<WaitUntilObserver> WaitUntilObserver::create(ExecutionContext* context, int eventID)
+PassRefPtr<WaitUntilObserver> WaitUntilObserver::create(ExecutionContext* context, int eventID)
 {
-    return adoptRefWillBeNoop(new WaitUntilObserver(context, eventID));
+    return adoptRef(new WaitUntilObserver(context, eventID));
 }
 
 WaitUntilObserver::~WaitUntilObserver()