Revert 166694 "Move serviceworker/ module to oilpan"

trunk/Source/modules/serviceworkers/ServiceWorker.h

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 13 matching lines @@
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #ifndef ServiceWorker_h
 #define ServiceWorker_h
 
-#include "heap/Handle.h"
 #include "public/platform/WebServiceWorker.h"
 #include "wtf/OwnPtr.h"
 #include "wtf/PassOwnPtr.h"
 #include "wtf/PassRefPtr.h"
 #include "wtf/RefCounted.h"
 
 namespace blink {
 class WebServiceWorker;
 }
 
 namespace WebCore {
 
-class ServiceWorker : public RefCountedWillBeGarbageCollectedFinalized<ServiceWorker> {
-    DECLARE_GC_INFO;
+class ServiceWorker : public RefCounted<ServiceWorker> {
 public:
-    static PassRefPtrWillBeRawPtr<ServiceWorker> create(PassOwnPtr<blink::WebServiceWorker> worker)
+    static PassRefPtr<ServiceWorker> create(PassOwnPtr<blink::WebServiceWorker> worker)
     {
-        return adoptRefWillBeNoop(new ServiceWorker(worker));
+        return adoptRef(new ServiceWorker(worker));
     }
 
     // For CallbackPromiseAdapter
     typedef blink::WebServiceWorker WebType;
-    static PassRefPtrWillBeRawPtr<ServiceWorker> from(WebType* worker)
+    static PassRefPtr<ServiceWorker> from(WebType* worker)
     {
         return create(adoptPtr(worker));
     }
 
     ~ServiceWorker() { }
 
-    void trace(Visitor*) { }
-
 private:
     explicit ServiceWorker(PassOwnPtr<blink::WebServiceWorker>);
 
     OwnPtr<blink::WebServiceWorker> m_outerWorker;
 };
 
 } // namespace WebCore
 
 #endif // ServiceWorker_h