Revert of Oilpan: Prepare to make ExecutionContext GarbageCollectedMixin.

Source/modules/indexeddb/IDBRequestTest.cpp

 /*
  * Copyright (C) 2012 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:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
@@ skipping 35 matching lines @@
 
 class NullEventQueue FINAL : public EventQueue {
 public:
     NullEventQueue() { }
     virtual ~NullEventQueue() { }
     virtual bool enqueueEvent(PassRefPtrWillBeRawPtr<Event>) OVERRIDE { return true; }
     virtual bool cancelEvent(Event*) OVERRIDE { return true; }
     virtual void close() OVERRIDE { }
 };
 
-class NullExecutionContext FINAL : public RefCountedWillBeGarbageCollectedFinalized<NullExecutionContext>, public ExecutionContext {
-    WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(NullExecutionContext);
+class NullExecutionContext FINAL : public ExecutionContext, public RefCounted<NullExecutionContext> {
 public:
-    void trace(Visitor* visitor) { ExecutionContext::trace(visitor); }
-#if !ENABLE(OILPAN)
     using RefCounted<NullExecutionContext>::ref;
     using RefCounted<NullExecutionContext>::deref;
 
     virtual void refExecutionContext() OVERRIDE { ref(); }
     virtual void derefExecutionContext() OVERRIDE { deref(); }
-#endif
     virtual EventQueue* eventQueue() const OVERRIDE { return m_queue.get(); }
 
     NullExecutionContext();
 private:
     OwnPtr<EventQueue> m_queue;
 };
 
 NullExecutionContext::NullExecutionContext()
     : m_queue(adoptPtr(new NullEventQueue()))
 {
 }
 
 class IDBRequestTest : public testing::Test {
 public:
     IDBRequestTest()
         : m_scope(v8::Isolate::GetCurrent())
-        , m_executionContext(adoptRefWillBeNoop(new NullExecutionContext()))
+        , m_executionContext(adoptRef(new NullExecutionContext()))
     {
         m_scope.scriptState()->setExecutionContext(m_executionContext.get());
     }
 
     ~IDBRequestTest()
     {
         m_scope.scriptState()->setExecutionContext(0);
     }
 
     v8::Isolate* isolate() const { return m_scope.isolate(); }
     ScriptState* scriptState() const { return m_scope.scriptState(); }
     ExecutionContext* executionContext() const { return m_scope.scriptState()->executionContext(); }
 
 private:
     V8TestingScope m_scope;
-    RefPtrWillBePersistent<ExecutionContext> m_executionContext;
+    RefPtr<ExecutionContext> m_executionContext;
 };
 
 TEST_F(IDBRequestTest, EventsAfterStopping)
 {
     IDBTransaction* transaction = 0;
     IDBRequest* request = IDBRequest::create(scriptState(), IDBAny::createUndefined(), transaction);
     EXPECT_EQ(request->readyState(), "pending");
     executionContext()->stopActiveDOMObjects();
 
     // Ensure none of the following raise assertions in stopped state:
@@ skipping 69 matching lines @@
         OwnPtr<MockWebIDBDatabase> backend = MockWebIDBDatabase::create();
         IDBOpenDBRequest* request = IDBOpenDBRequest::create(scriptState(), callbacks, transactionId, version);
         EXPECT_EQ(request->readyState(), "pending");
 
         executionContext()->stopActiveDOMObjects();
         request->onSuccess(backend.release(), metadata);
     }
 }
 
 } // namespace