Revert of Oilpan: Prepare to make ExecutionContext GarbageCollectedMixin.

Source/core/dom/MainThreadTaskRunnerTest.cpp

 /*
  * Copyright (C) 2008 Apple Inc. All Rights Reserved.
  * 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:
  * 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 29 matching lines @@
 
 class NullEventQueue : 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 : public RefCountedWillBeGarbageCollectedFinalized<NullExecutionContext>, public ExecutionContext {
-    WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(NullExecutionContext);
+class NullExecutionContext : 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(); }
     virtual bool tasksNeedSuspension() { return m_tasksNeedSuspension; }
 
     void setTasksNeedSuspention(bool flag) { m_tasksNeedSuspension = flag; }
 
     NullExecutionContext();
 
 private:
     bool m_tasksNeedSuspension;
     OwnPtr<EventQueue> m_queue;
@@ skipping 21 matching lines @@
     virtual void performTask(ExecutionContext* context) OVERRIDE
     {
         *m_toBeMarked = true;
     }
 
     bool* m_toBeMarked;
 };
 
 TEST(MainThreadTaskRunnerTest, PostTask)
 {
-    RefPtrWillBeRawPtr<NullExecutionContext> context = adoptRefWillBeNoop(new NullExecutionContext());
+    RefPtr<NullExecutionContext> context = adoptRef(new NullExecutionContext());
     OwnPtr<MainThreadTaskRunner> runner = MainThreadTaskRunner::create(context.get());
     bool isMarked = false;
 
     runner->postTask(MarkingBooleanTask::create(&isMarked));
     EXPECT_FALSE(isMarked);
     WebCore::testing::runPendingTasks();
     EXPECT_TRUE(isMarked);
 }
 
 TEST(MainThreadTaskRunnerTest, SuspendTask)
 {
-    RefPtrWillBeRawPtr<NullExecutionContext> context = adoptRefWillBeNoop(new NullExecutionContext());
+    RefPtr<NullExecutionContext> context = adoptRef(new NullExecutionContext());
     OwnPtr<MainThreadTaskRunner> runner = MainThreadTaskRunner::create(context.get());
     bool isMarked = false;
 
     context->setTasksNeedSuspention(true);
     runner->postTask(MarkingBooleanTask::create(&isMarked));
     runner->suspend();
     WebCore::testing::runPendingTasks();
     EXPECT_FALSE(isMarked);
 
     context->setTasksNeedSuspention(false);
     runner->resume();
     WebCore::testing::runPendingTasks();
     EXPECT_TRUE(isMarked);
 }
 
 TEST(MainThreadTaskRunnerTest, RemoveRunner)
 {
-    RefPtrWillBeRawPtr<NullExecutionContext> context = adoptRefWillBeNoop(new NullExecutionContext());
+    RefPtr<NullExecutionContext> context = adoptRef(new NullExecutionContext());
     OwnPtr<MainThreadTaskRunner> runner = MainThreadTaskRunner::create(context.get());
     bool isMarked = false;
 
     context->setTasksNeedSuspention(true);
     runner->postTask(MarkingBooleanTask::create(&isMarked));
     runner.clear();
     WebCore::testing::runPendingTasks();
     EXPECT_FALSE(isMarked);
 }
 
 }