(WIP) Worker: Merge ParentFrameTaskRunners into TaskRunnerHelper

third_party/WebKit/Source/core/loader/ThreadableLoaderTest.cpp

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 240f0b237e3e0982fdce58a43f023fbaf6ada875..7eefb402879e93d75ebdd8f077ac02c95bf0d287 100644
--- a/third_party/WebKit/Source/core/loader/ThreadableLoaderTest.cpp
+++ b/third_party/WebKit/Source/core/loader/ThreadableLoaderTest.cpp
@@ -237,15 +237,13 @@ class WorkerThreadableLoaderTestHelper : public ThreadableLoaderTestHelper,
   void onSetUp() override {
     m_mockWorkerReportingProxy = WTF::makeUnique<MockWorkerReportingProxy>();
     m_securityOrigin = document().getSecurityOrigin();
-    m_parentFrameTaskRunners =
-        ParentFrameTaskRunners::create(&m_dummyPageHolder->frame());
     m_workerThread = WTF::wrapUnique(
         new WorkerThreadForTest(this, *m_mockWorkerReportingProxy));
 
     expectWorkerLifetimeReportingCalls();
-    m_workerThread->startWithSourceCode(m_securityOrigin.get(),
-                                        "//fake source code",
-                                        m_parentFrameTaskRunners.get());
+    m_workerThread->startWithSourceCode(
+        m_securityOrigin.get(), "//fake source code",
+        FrameTaskRunnersHolder::create(&m_dummyPageHolder->frame()));
     m_workerThread->waitForInit();
   }
 
@@ -330,7 +328,7 @@ class WorkerThreadableLoaderTestHelper : public ThreadableLoaderTestHelper,
       std::unique_ptr<WTF::CrossThreadClosure> task) override {
     DCHECK(m_workerThread);
     DCHECK(m_workerThread->isCurrentThread());
-    m_parentFrameTaskRunners->get(TaskType::Networking)
+    FrameTaskRunnerHelper::get(TaskType::Networking, m_workerThread.get())
         ->postTask(BLINK_FROM_HERE, std::move(task));
   }
 
@@ -348,8 +346,6 @@ class WorkerThreadableLoaderTestHelper : public ThreadableLoaderTestHelper,
   std::unique_ptr<WorkerThreadForTest> m_workerThread;
 
   std::unique_ptr<DummyPageHolder> m_dummyPageHolder;
-  // Accessed cross-thread when worker thread posts tasks to the parent.
-  CrossThreadPersistent<ParentFrameTaskRunners> m_parentFrameTaskRunners;
   Checkpoint m_checkpoint;
   // |m_loader| must be touched only from the worker thread only.
   CrossThreadPersistent<ThreadableLoader> m_loader;