| Index: third_party/WebKit/Source/core/loader/ThreadableLoaderTest.cpp
|
| diff --git a/third_party/WebKit/Source/core/loader/ThreadableLoaderTest.cpp b/third_party/WebKit/Source/core/loader/ThreadableLoaderTest.cpp
|
| index 41ebccaa3a8dd68e55393821f0c2ac3b04f4ccdb..e1a793a720910684098c8b78410d73f019af0ad1 100644
|
| --- a/third_party/WebKit/Source/core/loader/ThreadableLoaderTest.cpp
|
| +++ b/third_party/WebKit/Source/core/loader/ThreadableLoaderTest.cpp
|
| @@ -178,11 +178,11 @@ class WorkerThreadableLoaderTestHelper : public ThreadableLoaderTestHelper,
|
| WTF::makeUnique<WaitableEvent>();
|
| postTaskToWorkerGlobalScope(
|
| BLINK_FROM_HERE,
|
| - createCrossThreadTask(
|
| - &WorkerThreadableLoaderTestHelper::workerCreateLoader,
|
| - crossThreadUnretained(this), crossThreadUnretained(client),
|
| - crossThreadUnretained(completionEvent.get()),
|
| - crossOriginRequestPolicy));
|
| + crossThreadBind(&WorkerThreadableLoaderTestHelper::workerCreateLoader,
|
| + crossThreadUnretained(this),
|
| + crossThreadUnretained(client),
|
| + crossThreadUnretained(completionEvent.get()),
|
| + crossOriginRequestPolicy));
|
| completionEvent->wait();
|
| }
|
|
|
| @@ -191,10 +191,9 @@ class WorkerThreadableLoaderTestHelper : public ThreadableLoaderTestHelper,
|
| WTF::makeUnique<WaitableEvent>();
|
| postTaskToWorkerGlobalScope(
|
| BLINK_FROM_HERE,
|
| - createCrossThreadTask(
|
| - &WorkerThreadableLoaderTestHelper::workerStartLoader,
|
| - crossThreadUnretained(this),
|
| - crossThreadUnretained(completionEvent.get()), request));
|
| + crossThreadBind(&WorkerThreadableLoaderTestHelper::workerStartLoader,
|
| + crossThreadUnretained(this),
|
| + crossThreadUnretained(completionEvent.get()), request));
|
| completionEvent->wait();
|
| }
|
|
|
| @@ -228,10 +227,9 @@ class WorkerThreadableLoaderTestHelper : public ThreadableLoaderTestHelper,
|
| WTF::makeUnique<WaitableEvent>();
|
| postTaskToWorkerGlobalScope(
|
| BLINK_FROM_HERE,
|
| - createCrossThreadTask(
|
| - &WorkerThreadableLoaderTestHelper::workerCallCheckpoint,
|
| - crossThreadUnretained(this),
|
| - crossThreadUnretained(completionEvent.get()), n));
|
| + crossThreadBind(&WorkerThreadableLoaderTestHelper::workerCallCheckpoint,
|
| + crossThreadUnretained(this),
|
| + crossThreadUnretained(completionEvent.get()), n));
|
| completionEvent->wait();
|
| }
|
|
|
| @@ -254,12 +252,12 @@ class WorkerThreadableLoaderTestHelper : public ThreadableLoaderTestHelper,
|
| void onTearDown() override {
|
| postTaskToWorkerGlobalScope(
|
| BLINK_FROM_HERE,
|
| - createCrossThreadTask(&WorkerThreadableLoaderTestHelper::clearLoader,
|
| - crossThreadUnretained(this)));
|
| + crossThreadBind(&WorkerThreadableLoaderTestHelper::clearLoader,
|
| + crossThreadUnretained(this)));
|
| WaitableEvent event;
|
| postTaskToWorkerGlobalScope(
|
| - BLINK_FROM_HERE, createCrossThreadTask(&WaitableEvent::signal,
|
| - crossThreadUnretained(&event)));
|
| + BLINK_FROM_HERE,
|
| + crossThreadBind(&WaitableEvent::signal, crossThreadUnretained(&event)));
|
| event.wait();
|
| m_workerThread->terminateAndWait();
|
|
|
| @@ -340,7 +338,7 @@ class WorkerThreadableLoaderTestHelper : public ThreadableLoaderTestHelper,
|
|
|
| void postTaskToWorkerGlobalScope(
|
| const WebTraceLocation& location,
|
| - std::unique_ptr<ExecutionContextTask> task) override {
|
| + std::unique_ptr<WTF::CrossThreadClosure> task) override {
|
| DCHECK(m_workerThread);
|
| m_workerThread->postTask(location, std::move(task));
|
| }
|
|
|