| Index: third_party/WebKit/Source/core/workers/WorkerThreadTestHelper.h
|
| diff --git a/third_party/WebKit/Source/core/workers/WorkerThreadTestHelper.h b/third_party/WebKit/Source/core/workers/WorkerThreadTestHelper.h
|
| index 0a64c67aaa5167e0798fd231d82c6236b5addc51..0195d0b161fb3377a6f12730b062556fbfac35b7 100644
|
| --- a/third_party/WebKit/Source/core/workers/WorkerThreadTestHelper.h
|
| +++ b/third_party/WebKit/Source/core/workers/WorkerThreadTestHelper.h
|
| @@ -7,6 +7,7 @@
|
| #include "bindings/core/v8/V8GCController.h"
|
| #include "core/frame/csp/ContentSecurityPolicy.h"
|
| #include "core/inspector/ConsoleMessage.h"
|
| +#include "core/workers/WorkerBackingThread.h"
|
| #include "core/workers/WorkerClients.h"
|
| #include "core/workers/WorkerLoaderProxy.h"
|
| #include "core/workers/WorkerReportingProxy.h"
|
| @@ -104,27 +105,13 @@ public:
|
| WorkerThreadForTest(
|
| WorkerLoaderProxyProvider* mockWorkerLoaderProxyProvider,
|
| WorkerReportingProxy& mockWorkerReportingProxy)
|
| - : WorkerThread(WorkerLoaderProxy::create(mockWorkerLoaderProxyProvider), mockWorkerReportingProxy)
|
| - , m_thread(WebThreadSupportingGC::create("Test thread"))
|
| + : WorkerThread(WorkerLoaderProxy::create(mockWorkerLoaderProxyProvider), mockWorkerReportingProxy, WorkerBackingThread::create("Test thread"))
|
| , m_scriptLoadedEvent(adoptPtr(new WaitableEvent()))
|
| {
|
| - ASSERT(m_thread);
|
| }
|
|
|
| ~WorkerThreadForTest() override { }
|
|
|
| - // WorkerThread implementation:
|
| - WebThreadSupportingGC& backingThread() override
|
| - {
|
| - ASSERT(m_thread);
|
| - return *m_thread;
|
| - }
|
| - void willDestroyIsolate() override
|
| - {
|
| - V8GCController::collectAllGarbageForTesting(v8::Isolate::GetCurrent());
|
| - WorkerThread::willDestroyIsolate();
|
| - }
|
| -
|
| PassRefPtrWillBeRawPtr<WorkerGlobalScope> createWorkerGlobalScope(PassOwnPtr<WorkerThreadStartupData> startupData) override
|
| {
|
| return adoptRefWillBeNoop(new FakeWorkerGlobalScope(startupData->m_scriptURL, startupData->m_userAgent, this, startupData->m_starterOriginPrivilegeData.release(), startupData->m_workerClients.release()));
|
| @@ -164,12 +151,11 @@ public:
|
| void waitForInit()
|
| {
|
| OwnPtr<WaitableEvent> completionEvent = adoptPtr(new WaitableEvent());
|
| - backingThread().postTask(BLINK_FROM_HERE, threadSafeBind(&WaitableEvent::signal, AllowCrossThreadAccess(completionEvent.get())));
|
| + workerBackingThread().backingThread().postTask(BLINK_FROM_HERE, threadSafeBind(&WaitableEvent::signal, AllowCrossThreadAccess(completionEvent.get())));
|
| completionEvent->wait();
|
| }
|
|
|
| private:
|
| - OwnPtr<WebThreadSupportingGC> m_thread;
|
| OwnPtr<WaitableEvent> m_scriptLoadedEvent;
|
| };
|
|
|
|
|