| Index: third_party/WebKit/Source/platform/threading/BackgroundTaskRunnerTest.cpp
|
| diff --git a/third_party/WebKit/Source/platform/threading/BackgroundTaskRunnerTest.cpp b/third_party/WebKit/Source/platform/threading/BackgroundTaskRunnerTest.cpp
|
| index 3c112bccee5365d282fc601ee85778be6f9ab6c5..b7e6e1a2d3a7d1a9eadf3598a52d7f6fb0834954 100644
|
| --- a/third_party/WebKit/Source/platform/threading/BackgroundTaskRunnerTest.cpp
|
| +++ b/third_party/WebKit/Source/platform/threading/BackgroundTaskRunnerTest.cpp
|
| @@ -4,7 +4,7 @@
|
|
|
| #include "platform/threading/BackgroundTaskRunner.h"
|
|
|
| -#include "platform/ThreadSafeFunctional.h"
|
| +#include "platform/CrossThreadFunctional.h"
|
| #include "platform/WaitableEvent.h"
|
| #include "public/platform/WebTraceLocation.h"
|
| #include "testing/gtest/include/gtest/gtest.h"
|
| @@ -27,7 +27,7 @@ class BackgroundTaskRunnerTest : public testing::Test {
|
| TEST_F(BackgroundTaskRunnerTest, RunShortTaskOnBackgroundThread)
|
| {
|
| std::unique_ptr<WaitableEvent> doneEvent = wrapUnique(new WaitableEvent());
|
| - BackgroundTaskRunner::postOnBackgroundThread(BLINK_FROM_HERE, threadSafeBind(&PingPongTask, crossThreadUnretained(doneEvent.get())), BackgroundTaskRunner::TaskSizeShortRunningTask);
|
| + BackgroundTaskRunner::postOnBackgroundThread(BLINK_FROM_HERE, crossThreadBind(&PingPongTask, crossThreadUnretained(doneEvent.get())), BackgroundTaskRunner::TaskSizeShortRunningTask);
|
| // Test passes by not hanging on the following wait().
|
| doneEvent->wait();
|
| }
|
| @@ -35,7 +35,7 @@ TEST_F(BackgroundTaskRunnerTest, RunShortTaskOnBackgroundThread)
|
| TEST_F(BackgroundTaskRunnerTest, RunLongTaskOnBackgroundThread)
|
| {
|
| std::unique_ptr<WaitableEvent> doneEvent = wrapUnique(new WaitableEvent());
|
| - BackgroundTaskRunner::postOnBackgroundThread(BLINK_FROM_HERE, threadSafeBind(&PingPongTask, crossThreadUnretained(doneEvent.get())), BackgroundTaskRunner::TaskSizeLongRunningTask);
|
| + BackgroundTaskRunner::postOnBackgroundThread(BLINK_FROM_HERE, crossThreadBind(&PingPongTask, crossThreadUnretained(doneEvent.get())), BackgroundTaskRunner::TaskSizeLongRunningTask);
|
| // Test passes by not hanging on the following wait().
|
| doneEvent->wait();
|
| }
|
|
|