| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "platform/threading/BackgroundTaskRunner.h" | 5 #include "platform/threading/BackgroundTaskRunner.h" |
| 6 | 6 |
| 7 #include "platform/ThreadSafeFunctional.h" | 7 #include "platform/ThreadSafeFunctional.h" |
| 8 #include "platform/WaitableEvent.h" | 8 #include "platform/WaitableEvent.h" |
| 9 #include "public/platform/WebTraceLocation.h" | 9 #include "public/platform/WebTraceLocation.h" |
| 10 #include "testing/gtest/include/gtest/gtest.h" | 10 #include "testing/gtest/include/gtest/gtest.h" |
| 11 #include "wtf/PtrUtil.h" | |
| 12 #include <memory> | |
| 13 | 11 |
| 14 | 12 |
| 15 namespace { | 13 namespace { |
| 16 | 14 |
| 17 using namespace blink; | 15 using namespace blink; |
| 18 | 16 |
| 19 void PingPongTask(WaitableEvent* doneEvent) | 17 void PingPongTask(WaitableEvent* doneEvent) |
| 20 { | 18 { |
| 21 doneEvent->signal(); | 19 doneEvent->signal(); |
| 22 } | 20 } |
| 23 | 21 |
| 24 class BackgroundTaskRunnerTest : public testing::Test { | 22 class BackgroundTaskRunnerTest : public testing::Test { |
| 25 }; | 23 }; |
| 26 | 24 |
| 27 TEST_F(BackgroundTaskRunnerTest, RunShortTaskOnBackgroundThread) | 25 TEST_F(BackgroundTaskRunnerTest, RunShortTaskOnBackgroundThread) |
| 28 { | 26 { |
| 29 std::unique_ptr<WaitableEvent> doneEvent = wrapUnique(new WaitableEvent()); | 27 OwnPtr<WaitableEvent> doneEvent = adoptPtr(new WaitableEvent()); |
| 30 BackgroundTaskRunner::postOnBackgroundThread(BLINK_FROM_HERE, threadSafeBind
(&PingPongTask, AllowCrossThreadAccess(doneEvent.get())), BackgroundTaskRunner::
TaskSizeShortRunningTask); | 28 BackgroundTaskRunner::postOnBackgroundThread(BLINK_FROM_HERE, threadSafeBind
(&PingPongTask, AllowCrossThreadAccess(doneEvent.get())), BackgroundTaskRunner::
TaskSizeShortRunningTask); |
| 31 // Test passes by not hanging on the following wait(). | 29 // Test passes by not hanging on the following wait(). |
| 32 doneEvent->wait(); | 30 doneEvent->wait(); |
| 33 } | 31 } |
| 34 | 32 |
| 35 TEST_F(BackgroundTaskRunnerTest, RunLongTaskOnBackgroundThread) | 33 TEST_F(BackgroundTaskRunnerTest, RunLongTaskOnBackgroundThread) |
| 36 { | 34 { |
| 37 std::unique_ptr<WaitableEvent> doneEvent = wrapUnique(new WaitableEvent()); | 35 OwnPtr<WaitableEvent> doneEvent = adoptPtr(new WaitableEvent()); |
| 38 BackgroundTaskRunner::postOnBackgroundThread(BLINK_FROM_HERE, threadSafeBind
(&PingPongTask, AllowCrossThreadAccess(doneEvent.get())), BackgroundTaskRunner::
TaskSizeLongRunningTask); | 36 BackgroundTaskRunner::postOnBackgroundThread(BLINK_FROM_HERE, threadSafeBind
(&PingPongTask, AllowCrossThreadAccess(doneEvent.get())), BackgroundTaskRunner::
TaskSizeLongRunningTask); |
| 39 // Test passes by not hanging on the following wait(). | 37 // Test passes by not hanging on the following wait(). |
| 40 doneEvent->wait(); | 38 doneEvent->wait(); |
| 41 } | 39 } |
| 42 | 40 |
| 43 } // unnamed namespace | 41 } // unnamed namespace |
| OLD | NEW |