(WIP) Worker: Merge ParentFrameTaskRunners into TaskRunnerHelper

third_party/WebKit/Source/core/workers/ThreadedMessagingProxyBase.cpp

Index: third_party/WebKit/Source/core/workers/ThreadedMessagingProxyBase.cpp
diff --git a/third_party/WebKit/Source/core/workers/ThreadedMessagingProxyBase.cpp b/third_party/WebKit/Source/core/workers/ThreadedMessagingProxyBase.cpp
index 62dd73a0c2f5e904f0d7cf3100eb56ac0fce72a3..274882dcba4129f33d9f7c7f2c9708633c128f21 100644
--- a/third_party/WebKit/Source/core/workers/ThreadedMessagingProxyBase.cpp
+++ b/third_party/WebKit/Source/core/workers/ThreadedMessagingProxyBase.cpp
@@ -25,8 +25,6 @@ ThreadedMessagingProxyBase::ThreadedMessagingProxyBase(
     ExecutionContext* executionContext)
     : m_executionContext(executionContext),
       m_workerInspectorProxy(WorkerInspectorProxy::create()),
-      m_parentFrameTaskRunners(ParentFrameTaskRunners::create(
-          toDocument(m_executionContext.get())->frame())),
       m_mayBeDestroyed(false),
       m_askedToTerminate(false) {
   DCHECK(isParentContextThread());
@@ -56,7 +54,8 @@ void ThreadedMessagingProxyBase::initializeWorkerThread(
 
   m_loaderProxy = WorkerLoaderProxy::create(this);
   m_workerThread = createWorkerThread(originTime);
-  m_workerThread->start(std::move(startupData), getParentFrameTaskRunners());
+  m_workerThread->start(std::move(startupData),
+                        FrameTaskRunnersHolder::create(document->frame()));
   workerThreadCreated();
 }
 
@@ -73,7 +72,7 @@ void ThreadedMessagingProxyBase::postTaskToWorkerGlobalScope(
 void ThreadedMessagingProxyBase::postTaskToLoader(
     const WebTraceLocation& location,
     std::unique_ptr<WTF::CrossThreadClosure> task) {
-  m_parentFrameTaskRunners->get(TaskType::Networking)
+  FrameTaskRunnerHelper::get(TaskType::Networking, m_workerThread.get())
       ->postTask(BLINK_FROM_HERE, std::move(task));
 }
 
@@ -113,9 +112,7 @@ void ThreadedMessagingProxyBase::workerThreadCreated() {
 
 void ThreadedMessagingProxyBase::parentObjectDestroyed() {
   DCHECK(isParentContextThread());
-
-  getParentFrameTaskRunners()
-      ->get(TaskType::UnspecedTimer)
+  FrameTaskRunnerHelper::get(TaskType::UnspecedTimer, m_workerThread.get())
       ->postTask(
           BLINK_FROM_HERE,
           WTF::bind(&ThreadedMessagingProxyBase::parentObjectDestroyedInternal,