Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(717)

Unified Diff: third_party/WebKit/Source/core/workers/DedicatedWorkerTest.cpp

Issue 2718643002: Worker: Pass ParentFrameTaskRunners via WorkerThread::start() instead of the ctor (Closed)
Patch Set: Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/core/workers/DedicatedWorkerTest.cpp
diff --git a/third_party/WebKit/Source/core/workers/DedicatedWorkerTest.cpp b/third_party/WebKit/Source/core/workers/DedicatedWorkerTest.cpp
index 69bc7f00239c981f36330c57457c7d2b8d8c1492..d0b11fc42396583552d50c6123a56b9d01b762d8 100644
--- a/third_party/WebKit/Source/core/workers/DedicatedWorkerTest.cpp
+++ b/third_party/WebKit/Source/core/workers/DedicatedWorkerTest.cpp
@@ -38,12 +38,10 @@ class DedicatedWorkerThreadForTest final : public DedicatedWorkerThread {
public:
DedicatedWorkerThreadForTest(
WorkerLoaderProxyProvider* workerLoaderProxyProvider,
- InProcessWorkerObjectProxy& workerObjectProxy,
- ParentFrameTaskRunners* parentFrameTaskRunners)
+ InProcessWorkerObjectProxy& workerObjectProxy)
: DedicatedWorkerThread(
WorkerLoaderProxy::create(workerLoaderProxyProvider),
workerObjectProxy,
- parentFrameTaskRunners,
monotonicallyIncreasingTime()) {
m_workerBackingThread = WorkerBackingThread::createForTest("Test thread");
}
@@ -96,8 +94,7 @@ class InProcessWorkerMessagingProxyForTest
m_mockWorkerLoaderProxyProvider =
WTF::makeUnique<MockWorkerLoaderProxyProvider>();
m_workerThread = WTF::wrapUnique(new DedicatedWorkerThreadForTest(
- m_mockWorkerLoaderProxyProvider.get(), workerObjectProxy(),
- getParentFrameTaskRunners()));
+ m_mockWorkerLoaderProxyProvider.get(), workerObjectProxy()));
m_mockWorkerThreadLifecycleObserver = new MockWorkerThreadLifecycleObserver(
m_workerThread->getWorkerThreadLifecycleContext());
EXPECT_CALL(*m_mockWorkerThreadLifecycleObserver,
@@ -119,13 +116,15 @@ class InProcessWorkerMessagingProxyForTest
CSPHeaderAndType headerAndType("contentSecurityPolicy",
ContentSecurityPolicyHeaderTypeReport);
headers->push_back(headerAndType);
- workerThread()->start(WorkerThreadStartupData::create(
- scriptURL, "fake user agent", source, nullptr /* cachedMetaData */,
- DontPauseWorkerGlobalScopeOnStart, headers.get(),
- "" /* referrerPolicy */, m_securityOrigin.get(),
- nullptr /* workerClients */, WebAddressSpaceLocal,
- nullptr /* originTrialTokens */, nullptr /* workerSettings */,
- WorkerV8Settings::Default()));
+ workerThread()->start(
+ WorkerThreadStartupData::create(
+ scriptURL, "fake user agent", source, nullptr /* cachedMetaData */,
+ DontPauseWorkerGlobalScopeOnStart, headers.get(),
+ "" /* referrerPolicy */, m_securityOrigin.get(),
+ nullptr /* workerClients */, WebAddressSpaceLocal,
+ nullptr /* originTrialTokens */, nullptr /* workerSettings */,
+ WorkerV8Settings::Default()),
+ getParentFrameTaskRunners());
workerInspectorProxy()->workerThreadCreated(
toDocument(getExecutionContext()), m_workerThread.get(), scriptURL);

Powered by Google App Engine
This is Rietveld 408576698