Fetch DataConsumerHandle test cleanup

Source/modules/fetch/CompositeDataConsumerHandleTest.cpp

 // 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.
 
 #include "config.h"
 #include "modules/fetch/CompositeDataConsumerHandle.h"
 
 #include "modules/fetch/DataConsumerHandleTestUtil.h"
 #include "platform/Task.h"
 #include "platform/ThreadSafeFunctional.h"
@@ skipping 38 matching lines @@
     MOCK_METHOD1(obtainReaderInternal, Reader*(Client*));
 };
 
 class ThreadingRegistrationTest : public DataConsumerHandleTestUtil::ThreadingTestBase {
 public:
     using Self = ThreadingRegistrationTest;
     void run()
     {
         m_context = Context::create();
         m_waitableEvent = adoptPtr(Platform::current()->createWaitableEvent());
-        m_handle = CompositeDataConsumerHandle::create(adoptPtr(new DataConsumerHandle("handle1", m_context)));
 
-        readingThread()->postTask(FROM_HERE, new Task(threadSafeBind(&Self::obtainReader, this)));
-
-        m_waitableEvent->wait();
+        postTaskAndWait(updatingThread(), FROM_HERE, new Task(threadSafeBind(&Self::createHandle, this)));
+        postTaskAndWait(readingThread(), FROM_HERE, new Task(threadSafeBind(&Self::obtainReader, this)));
     }
 
 private:
+    void createHandle()
+    {
+        m_handle = CompositeDataConsumerHandle::create(adoptPtr(new DataConsumerHandle("handle1", m_context)));
+        m_waitableEvent->signal();
+    }
     void obtainReader()
     {
         m_reader = m_handle->obtainReader(&m_client);
         updatingThread()->postTask(FROM_HERE, new Task(threadSafeBind(&Self::update, this)));
     }
     void update()
     {
         m_handle->update(adoptPtr(new DataConsumerHandle("handle2", m_context)));
         readingThread()->postTask(FROM_HERE, new Task(threadSafeBind(&Self::resetReader, this)));
         readingThread()->postTask(FROM_HERE, new Task(threadSafeBind(&Self::signalDone, this)));
     }
 
     OwnPtr<CompositeDataConsumerHandle> m_handle;
 };
 
 class ThreadingRegistrationDeleteHandleTest : public DataConsumerHandleTestUtil::ThreadingTestBase {
 public:
     using Self = ThreadingRegistrationDeleteHandleTest;
     void run()
     {
         m_context = Context::create();
         m_waitableEvent = adoptPtr(Platform::current()->createWaitableEvent());
-        m_handle = CompositeDataConsumerHandle::create(adoptPtr(new DataConsumerHandle("handle1", m_context)));
 
-        readingThread()->postTask(FROM_HERE, new Task(threadSafeBind(&Self::obtainReader, this)));
-
-        m_waitableEvent->wait();
+        postTaskAndWait(updatingThread(), FROM_HERE, new Task(threadSafeBind(&Self::createHandle, this)));
+        postTaskAndWait(readingThread(), FROM_HERE, new Task(threadSafeBind(&Self::obtainReader, this)));
     }
 
 private:
+    void createHandle()
+    {
+        m_handle = CompositeDataConsumerHandle::create(adoptPtr(new DataConsumerHandle("handle1", m_context)));
+        m_waitableEvent->signal();
+    }
+
     void obtainReader()
     {
         m_reader = m_handle->obtainReader(&m_client);
         updatingThread()->postTask(FROM_HERE, new Task(threadSafeBind(&Self::update, this)));
     }
     void update()
     {
         m_handle->update(adoptPtr(new DataConsumerHandle("handle2", m_context)));
         m_handle = nullptr;
         readingThread()->postTask(FROM_HERE, new Task(threadSafeBind(&Self::resetReader, this)));
         readingThread()->postTask(FROM_HERE, new Task(threadSafeBind(&Self::signalDone, this)));
     }
 
     OwnPtr<CompositeDataConsumerHandle> m_handle;
 };
 
 class ThreadingRegistrationDeleteReaderTest : public DataConsumerHandleTestUtil::ThreadingTestBase {
 public:
     using Self = ThreadingRegistrationDeleteReaderTest;
     void run()
     {
         m_context = Context::create();
         m_waitableEvent = adoptPtr(Platform::current()->createWaitableEvent());
-        m_handle = CompositeDataConsumerHandle::create(adoptPtr(new DataConsumerHandle("handle1", m_context)));
 
-        readingThread()->postTask(FROM_HERE, new Task(threadSafeBind(&Self::obtainReader, this)));
-
-        m_waitableEvent->wait();
+        postTaskAndWait(updatingThread(), FROM_HERE, new Task(threadSafeBind(&Self::createHandle, this)));
+        postTaskAndWait(readingThread(), FROM_HERE, new Task(threadSafeBind(&Self::obtainReader, this)));
     }
 
 private:
+    void createHandle()
+    {
+        m_handle = CompositeDataConsumerHandle::create(adoptPtr(new DataConsumerHandle("handle1", m_context)));
+        m_waitableEvent->signal();
+    }
+
     void obtainReader()
     {
         m_reader = m_handle->obtainReader(&m_client);
         updatingThread()->postTask(FROM_HERE, new Task(threadSafeBind(&Self::update, this)));
     }
     void update()
     {
         readingThread()->postTask(FROM_HERE, new Task(threadSafeBind(&Self::resetReader, this)));
         m_handle->update(adoptPtr(new DataConsumerHandle("handle2", m_context)));
         readingThread()->postTask(FROM_HERE, new Task(threadSafeBind(&Self::resetReader, this)));
         readingThread()->postTask(FROM_HERE, new Task(threadSafeBind(&Self::signalDone, this)));
     }
 
     OwnPtr<CompositeDataConsumerHandle> m_handle;
 };
 
 class ThreadingUpdatingReaderWhileUpdatingTest : public DataConsumerHandleTestUtil::ThreadingTestBase {
 public:
     using Self = ThreadingUpdatingReaderWhileUpdatingTest;
     void run()
     {
         m_context = Context::create();
         m_waitableEvent = adoptPtr(Platform::current()->createWaitableEvent());
         m_updateEvent = adoptPtr(Platform::current()->createWaitableEvent());
-        m_handle = CompositeDataConsumerHandle::create(adoptPtr(new DataConsumerHandle("handle1", m_context)));
 
-        readingThread()->postTask(FROM_HERE, new Task(threadSafeBind(&Self::obtainReader, this)));
-
-        m_waitableEvent->wait();
+        postTaskAndWait(updatingThread(), FROM_HERE, new Task(threadSafeBind(&Self::createHandle, this)));
+        postTaskAndWait(readingThread(), FROM_HERE, new Task(threadSafeBind(&Self::obtainReader, this)));
     }
 
 private:
+    void createHandle()
+    {
+        m_handle = CompositeDataConsumerHandle::create(adoptPtr(new DataConsumerHandle("handle1", m_context)));
+        m_waitableEvent->signal();
+    }
+
     void obtainReader()
     {
         m_reader = m_handle->obtainReader(&m_client);
         updatingThread()->postTask(FROM_HERE, new Task(threadSafeBind(&Self::update, this)));
         m_updateEvent->wait();
     }
 
     void update()
     {
         readingThread()->postTask(FROM_HERE, new Task(threadSafeBind(&Self::reobtainReader, this)));
@@ skipping 13 matching lines @@
     OwnPtr<WebWaitableEvent> m_updateEvent;
 };
 
 class ThreadingRegistrationUpdateTwiceAtOneTimeTest : public DataConsumerHandleTestUtil::ThreadingTestBase {
 public:
     using Self = ThreadingRegistrationUpdateTwiceAtOneTimeTest;
     void run()
     {
         m_context = Context::create();
         m_waitableEvent = adoptPtr(Platform::current()->createWaitableEvent());
-        m_handle = CompositeDataConsumerHandle::create(adoptPtr(new DataConsumerHandle("handle1", m_context)));
 
-        readingThread()->postTask(FROM_HERE, new Task(threadSafeBind(&Self::obtainReader, this)));
-
-        m_waitableEvent->wait();
+        postTaskAndWait(updatingThread(), FROM_HERE, new Task(threadSafeBind(&Self::createHandle, this)));
+        postTaskAndWait(readingThread(), FROM_HERE, new Task(threadSafeBind(&Self::obtainReader, this)));
     }
 
 private:
+    void createHandle()
+    {
+        m_handle = CompositeDataConsumerHandle::create(adoptPtr(new DataConsumerHandle("handle1", m_context)));
+        m_waitableEvent->signal();
+    }
+
     void obtainReader()
     {
         m_reader = m_handle->obtainReader(&m_client);
         updatingThread()->postTask(FROM_HERE, new Task(threadSafeBind(&Self::update, this)));
     }
     void update()
     {
         m_handle->update(adoptPtr(new DataConsumerHandle("handle2", m_context)));
         m_handle->update(adoptPtr(new DataConsumerHandle("handle3", m_context)));
         readingThread()->postTask(FROM_HERE, new Task(threadSafeBind(&Self::resetReader, this)));
@@ skipping 218 matching lines @@
 TEST(CompositeDataConsumerHandleTest, DoneHandleNoNotification)
 {
     DataConsumerHandleTestUtil::ThreadingHandleNoNotificationTest test;
     // Test this function doesn't crash.
     test.run(CompositeDataConsumerHandle::create(createDoneDataConsumerHandle()));
 }
 
 } // namespace
 
 } // namespace blink