Oilpan: convert remaining OwnPtr EventQueue uses.

R=haraken@chromium.org
BUG=

Review URL: https://codereview.chromium.org/336693006

git-svn-id: svn://svn.chromium.org/blink/trunk@176100 bbb929c8-8fbe-4397-9dbb-9b2b20218538

third_party/WebKit/Source/core/dom/MainThreadTaskRunnerTest.cpp

@@ -50,7 +50,19 @@ public:
 class NullExecutionContext : public RefCountedWillBeGarbageCollectedFinalized<NullExecutionContext>, public ExecutionContext {
     WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(NullExecutionContext);
 public:
-    void trace(Visitor* visitor) { ExecutionContext::trace(visitor); }
+    NullExecutionContext();
+
+    virtual EventQueue* eventQueue() const OVERRIDE { return m_queue.get(); }
+    virtual bool tasksNeedSuspension() { return m_tasksNeedSuspension; }
+
+    void setTasksNeedSuspention(bool flag) { m_tasksNeedSuspension = flag; }
+
+    void trace(Visitor* visitor)
+    {
+        visitor->trace(m_queue);
+        ExecutionContext::trace(visitor);
+    }
+
 #if !ENABLE(OILPAN)
     using RefCounted<NullExecutionContext>::ref;
     using RefCounted<NullExecutionContext>::deref;
@@ -58,21 +70,15 @@ public:
     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;
+    OwnPtrWillBeMember<EventQueue> m_queue;
 };
 
 NullExecutionContext::NullExecutionContext()
     : m_tasksNeedSuspension(false)
-    , m_queue(adoptPtr(new NullEventQueue()))
+    , m_queue(adoptPtrWillBeNoop(new NullEventQueue()))
 {
 }
 

third_party/WebKit/Source/modules/indexeddb/IDBRequestTest.cpp

@@ -56,7 +56,16 @@ public:
 class NullExecutionContext FINAL : public RefCountedWillBeGarbageCollectedFinalized<NullExecutionContext>, public ExecutionContext {
     WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(NullExecutionContext);
 public:
-    void trace(Visitor* visitor) { ExecutionContext::trace(visitor); }
+    NullExecutionContext();
+
+    virtual EventQueue* eventQueue() const OVERRIDE { return m_queue.get(); }
+
+    void trace(Visitor* visitor)
+    {
+        visitor->trace(m_queue);
+        ExecutionContext::trace(visitor);
+    }
+
 #if !ENABLE(OILPAN)
     using RefCounted<NullExecutionContext>::ref;
     using RefCounted<NullExecutionContext>::deref;
@@ -64,15 +73,13 @@ public:
     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;
+    OwnPtrWillBeMember<EventQueue> m_queue;
 };
 
 NullExecutionContext::NullExecutionContext()
-    : m_queue(adoptPtr(new NullEventQueue()))
+    : m_queue(adoptPtrWillBeNoop(new NullEventQueue()))
 {
 }