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

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

Issue 2539443004: Worker: Move ParentFrameTaskRunners from WorkerReportingProxy to ObjectProxy (Closed)
Patch Set: rebase Created 3 years, 11 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 06663d12d2854378ba269a17136ef0abeef728e4..0f68bc20efd100ebdbfce7a95c7db31ab1ee6f43 100644
--- a/third_party/WebKit/Source/core/workers/DedicatedWorkerTest.cpp
+++ b/third_party/WebKit/Source/core/workers/DedicatedWorkerTest.cpp
@@ -38,10 +38,12 @@ class DedicatedWorkerThreadForTest final : public DedicatedWorkerThread {
public:
DedicatedWorkerThreadForTest(
WorkerLoaderProxyProvider* workerLoaderProxyProvider,
- InProcessWorkerObjectProxy& workerObjectProxy)
+ InProcessWorkerObjectProxy& workerObjectProxy,
+ ParentFrameTaskRunners* parentFrameTaskRunners)
: DedicatedWorkerThread(
WorkerLoaderProxy::create(workerLoaderProxyProvider),
workerObjectProxy,
+ parentFrameTaskRunners,
monotonicallyIncreasingTime()) {
m_workerBackingThread = WorkerBackingThread::createForTest("Test thread");
}
@@ -58,8 +60,7 @@ class DedicatedWorkerThreadForTest final : public DedicatedWorkerThread {
void countFeature(UseCounter::Feature feature) {
EXPECT_TRUE(isCurrentThread());
globalScope()->countFeature(feature);
- workerReportingProxy()
- .getParentFrameTaskRunners()
+ getParentFrameTaskRunners()
->get(TaskType::UnspecedTimer)
->postTask(BLINK_FROM_HERE, crossThreadBind(&testing::exitRunLoop));
}
@@ -75,8 +76,7 @@ class DedicatedWorkerThreadForTest final : public DedicatedWorkerThread {
String consoleMessage = consoleMessageStorage()->at(0)->message();
EXPECT_TRUE(consoleMessage.contains("deprecated"));
- workerReportingProxy()
- .getParentFrameTaskRunners()
+ getParentFrameTaskRunners()
->get(TaskType::UnspecedTimer)
->postTask(BLINK_FROM_HERE, crossThreadBind(&testing::exitRunLoop));
}
@@ -96,7 +96,8 @@ class InProcessWorkerMessagingProxyForTest
m_mockWorkerLoaderProxyProvider =
WTF::makeUnique<MockWorkerLoaderProxyProvider>();
m_workerThread = WTF::wrapUnique(new DedicatedWorkerThreadForTest(
- m_mockWorkerLoaderProxyProvider.get(), workerObjectProxy()));
+ m_mockWorkerLoaderProxyProvider.get(), workerObjectProxy(),
+ getParentFrameTaskRunners()));
m_mockWorkerThreadLifecycleObserver = new MockWorkerThreadLifecycleObserver(
m_workerThread->getWorkerThreadLifecycleContext());
EXPECT_CALL(*m_mockWorkerThreadLifecycleObserver,

Powered by Google App Engine
This is Rietveld 408576698