(WIP) Worker: Merge ParentFrameTaskRunners into TaskRunnerHelper

third_party/WebKit/Source/core/workers/WorkerThread.h

Index: third_party/WebKit/Source/core/workers/WorkerThread.h
diff --git a/third_party/WebKit/Source/core/workers/WorkerThread.h b/third_party/WebKit/Source/core/workers/WorkerThread.h
index 6c27763eadd869cc076b7900448e807c1eb4b760..9cf6ae2f34d1a9e0c7ac0ef1f980b957a507ed79 100644
--- a/third_party/WebKit/Source/core/workers/WorkerThread.h
+++ b/third_party/WebKit/Source/core/workers/WorkerThread.h
@@ -30,8 +30,8 @@
 #include <memory>
 
 #include "core/CoreExport.h"
+#include "core/dom/TaskRunnerHelper.h"
 #include "core/frame/csp/ContentSecurityPolicy.h"
-#include "core/workers/ParentFrameTaskRunners.h"
 #include "core/workers/WorkerLoaderProxy.h"
 #include "core/workers/WorkerThreadLifecycleObserver.h"
 #include "platform/LifecycleNotifier.h"
@@ -107,7 +107,7 @@ class CORE_EXPORT WorkerThread : public WebThread::TaskObserver {
   virtual ~WorkerThread();
 
   // Called on the main thread.
-  void start(std::unique_ptr<WorkerThreadStartupData>, ParentFrameTaskRunners*);
+  void start(std::unique_ptr<WorkerThreadStartupData>, FrameTaskRunnersHolder*);
   void terminate();
 
   // Called on the main thread. Internally calls terminateInternal() and wait
@@ -171,10 +171,6 @@ class CORE_EXPORT WorkerThread : public WebThread::TaskObserver {
 
   void waitForShutdownForTesting() { m_shutdownEvent->wait(); }
 
-  ParentFrameTaskRunners* getParentFrameTaskRunners() const {
-    return m_parentFrameTaskRunners.get();
-  }
-
  protected:
   WorkerThread(PassRefPtr<WorkerLoaderProxy>, WorkerReportingProxy&);
 
@@ -248,7 +244,8 @@ class CORE_EXPORT WorkerThread : public WebThread::TaskObserver {
   // hasn't been notified to the calling thread.
   bool isInShutdown();
 
-  void initializeOnWorkerThread(std::unique_ptr<WorkerThreadStartupData>);
+  void initializeOnWorkerThread(std::unique_ptr<WorkerThreadStartupData>,
+                                FrameTaskRunnersHolder*);
   void prepareForShutdownOnWorkerThread();
   void performShutdownOnWorkerThread();
   void performTaskOnWorkerThread(std::unique_ptr<CrossThreadClosure>);
@@ -291,7 +288,7 @@ class CORE_EXPORT WorkerThread : public WebThread::TaskObserver {
 
   RefPtr<WorkerLoaderProxy> m_workerLoaderProxy;
   WorkerReportingProxy& m_workerReportingProxy;
-  CrossThreadPersistent<ParentFrameTaskRunners> m_parentFrameTaskRunners;
+  Persistent<FrameTaskRunnersHolder> m_frameTaskRunners;
 
   // This lock protects |m_globalScope|, |m_requestedToTerminate|,
   // |m_threadState|, |m_runningDebuggerTask| and |m_exitCode|.