Remove most of the blink::Task wrapping of WTF::Function outside WebTaskRunner

third_party/WebKit/Source/modules/fetch/DataConsumerHandleTestUtil.h

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef DataConsumerHandleTestUtil_h
 #define DataConsumerHandleTestUtil_h
 
 #include "bindings/core/v8/ScriptState.h"
 #include "core/testing/NullExecutionContext.h"
 #include "gin/public/isolate_holder.h"
 #include "modules/fetch/DataConsumerHandleUtil.h"
 #include "modules/fetch/FetchDataConsumerHandle.h"
 #include "modules/fetch/FetchDataLoader.h"
-#include "platform/Task.h"
 #include "platform/ThreadSafeFunctional.h"
 #include "platform/WaitableEvent.h"
 #include "platform/WebThreadSupportingGC.h"
 #include "platform/heap/Handle.h"
 #include "public/platform/Platform.h"
 #include "public/platform/WebDataConsumerHandle.h"
 #include "public/platform/WebTraceLocation.h"
 #include "wtf/Deque.h"
 #include "wtf/Locker.h"
 #include "wtf/OwnPtr.h"
@@ skipping 84 matching lines @@
                 MutexLocker locker(m_holderMutex);
                 ASSERT(!m_holder);
                 m_holder = holder;
             }
             void unregisterThreadHolder()
             {
                 MutexLocker locker(m_holderMutex);
                 ASSERT(m_holder);
                 m_holder = nullptr;
             }
-            void postTaskToReadingThread(const WebTraceLocation& location, Task* task)
+            void postTaskToReadingThread(const WebTraceLocation& location, PassOwnPtr<Closure> task)
             {
                 MutexLocker locker(m_holderMutex);
                 ASSERT(m_holder);
                 m_holder->readingThread()->postTask(location, task);
             }
-            void postTaskToUpdatingThread(const WebTraceLocation& location, Task* task)
+            void postTaskToUpdatingThread(const WebTraceLocation& location, PassOwnPtr<Closure> task)
             {
                 MutexLocker locker(m_holderMutex);
                 ASSERT(m_holder);
                 m_holder->updatingThread()->postTask(location, task);
             }
 
         private:
             Context()
                 : m_holder(nullptr) { }
             String currentThreadName()
@@ skipping 76 matching lines @@
             Reader* obtainReaderInternal(Client*) { return new ReaderImpl(m_name, m_context); }
             const char* debugName() const override { return "ThreadingTestBase::DataConsumerHandle"; }
 
             const String m_name;
             RefPtr<Context> m_context;
         };
 
         void resetReader() { m_reader = nullptr; }
         void signalDone() { m_waitableEvent->signal(); }
         const String& result() { return m_context->result(); }
-        void postTaskToReadingThread(const WebTraceLocation& location, Task* task)
+        void postTaskToReadingThread(const WebTraceLocation& location, PassOwnPtr<Closure> task)
         {
             m_context->postTaskToReadingThread(location,  task);
         }
-        void postTaskToUpdatingThread(const WebTraceLocation& location, Task* task)
+        void postTaskToUpdatingThread(const WebTraceLocation& location, PassOwnPtr<Closure> task)
         {
             m_context->postTaskToUpdatingThread(location,  task);
         }
-        void postTaskToReadingThreadAndWait(const WebTraceLocation& location, Task* task)
+        void postTaskToReadingThreadAndWait(const WebTraceLocation& location, PassOwnPtr<Closure> task)
         {
             postTaskToReadingThread(location,  task);
             m_waitableEvent->wait();
         }
-        void postTaskToUpdatingThreadAndWait(const WebTraceLocation& location, Task* task)
+        void postTaskToUpdatingThreadAndWait(const WebTraceLocation& location, PassOwnPtr<Closure> task)
         {
             postTaskToUpdatingThread(location,  task);
             m_waitableEvent->wait();
         }
     protected:
         ThreadingTestBase()
             : m_context(Context::create()) { }
 
         RefPtr<Context> m_context;
         OwnPtr<WebDataConsumerHandle::Reader> m_reader;
         OwnPtr<WaitableEvent> m_waitableEvent;
         NoopClient m_client;
     };
 
     class ThreadingHandleNotificationTest : public ThreadingTestBase, public WebDataConsumerHandle::Client {
     public:
         using Self = ThreadingHandleNotificationTest;
         static PassRefPtr<Self> create() { return adoptRef(new Self); }
 
         void run(PassOwnPtr<WebDataConsumerHandle> handle)
         {
             ThreadHolder holder(this);
             m_waitableEvent = adoptPtr(new WaitableEvent());
             m_handle = handle;
 
-            postTaskToReadingThreadAndWait(BLINK_FROM_HERE, new Task(threadSafeBind(&Self::obtainReader, this)));
+            postTaskToReadingThreadAndWait(BLINK_FROM_HERE, threadSafeBind(&Self::obtainReader, this));
         }
 
     private:
         ThreadingHandleNotificationTest() = default;
         void obtainReader()
         {
             m_reader = m_handle->obtainReader(this);
         }
         void didGetReadable() override
         {
-            postTaskToReadingThread(BLINK_FROM_HERE, new Task(threadSafeBind(&Self::resetReader, this)));
-            postTaskToReadingThread(BLINK_FROM_HERE, new Task(threadSafeBind(&Self::signalDone, this)));
+            postTaskToReadingThread(BLINK_FROM_HERE, threadSafeBind(&Self::resetReader, this));
+            postTaskToReadingThread(BLINK_FROM_HERE, threadSafeBind(&Self::signalDone, this));
         }
 
         OwnPtr<WebDataConsumerHandle> m_handle;
     };
 
     class ThreadingHandleNoNotificationTest : public ThreadingTestBase, public WebDataConsumerHandle::Client {
     public:
         using Self = ThreadingHandleNoNotificationTest;
         static PassRefPtr<Self> create() { return adoptRef(new Self); }
 
         void run(PassOwnPtr<WebDataConsumerHandle> handle)
         {
             ThreadHolder holder(this);
             m_waitableEvent = adoptPtr(new WaitableEvent());
             m_handle = handle;
 
-            postTaskToReadingThreadAndWait(BLINK_FROM_HERE, new Task(threadSafeBind(&Self::obtainReader, this)));
+            postTaskToReadingThreadAndWait(BLINK_FROM_HERE, threadSafeBind(&Self::obtainReader, this));
         }
 
     private:
         ThreadingHandleNoNotificationTest() = default;
         void obtainReader()
         {
             m_reader = m_handle->obtainReader(this);
             m_reader = nullptr;
-            postTaskToReadingThread(BLINK_FROM_HERE, new Task(threadSafeBind(&Self::signalDone, this)));
+            postTaskToReadingThread(BLINK_FROM_HERE, threadSafeBind(&Self::signalDone, this));
         }
         void didGetReadable() override
         {
             ASSERT_NOT_REACHED();
         }
 
         OwnPtr<WebDataConsumerHandle> m_handle;
     };
 
     class MockFetchDataConsumerHandle : public FetchDataConsumerHandle {
@@ skipping 184 matching lines @@
     // where T is one of HandleReader and HandleTwophaseReader.
     template <typename T>
     class HandleReaderRunner final {
         STACK_ALLOCATED();
     public:
         explicit HandleReaderRunner(PassOwnPtr<WebDataConsumerHandle> handle)
             : m_thread(adoptPtr(new Thread("reading thread")))
             , m_event(adoptPtr(new WaitableEvent()))
             , m_isDone(false)
         {
-            m_thread->thread()->postTask(BLINK_FROM_HERE, new Task(threadSafeBind(&HandleReaderRunner::start, AllowCrossThreadAccess(this), handle)));
+            m_thread->thread()->postTask(BLINK_FROM_HERE, threadSafeBind(&HandleReaderRunner::start, AllowCrossThreadAccess(this), handle));
         }
         ~HandleReaderRunner()
         {
             wait();
         }
 
         PassOwnPtr<HandleReadResult> wait()
         {
             if (m_isDone)
                 return nullptr;
@@ skipping 20 matching lines @@
         OwnPtr<HandleReadResult> m_result;
         bool m_isDone;
 
         OwnPtr<T> m_handleReader;
     };
 };
 
 } // namespace blink
 
 #endif // DataConsumerHandleTestUtil_h