(WIP) Worker: Merge ParentFrameTaskRunners into TaskRunnerHelper

third_party/WebKit/Source/modules/compositorworker/CompositorWorkerThreadTest.cpp

Index: third_party/WebKit/Source/modules/compositorworker/CompositorWorkerThreadTest.cpp
diff --git a/third_party/WebKit/Source/modules/compositorworker/CompositorWorkerThreadTest.cpp b/third_party/WebKit/Source/modules/compositorworker/CompositorWorkerThreadTest.cpp
index 6598af7b041e9cb5abafa1252a6996dcb52acc7a..967bd936ba16fe5986e2beef385e750688fba9c7 100644
--- a/third_party/WebKit/Source/modules/compositorworker/CompositorWorkerThreadTest.cpp
+++ b/third_party/WebKit/Source/modules/compositorworker/CompositorWorkerThreadTest.cpp
@@ -11,7 +11,6 @@
 #include "core/dom/CompositorWorkerProxyClient.h"
 #include "core/inspector/ConsoleMessage.h"
 #include "core/workers/InProcessWorkerObjectProxy.h"
-#include "core/workers/ParentFrameTaskRunners.h"
 #include "core/workers/WorkerBackingThread.h"
 #include "core/workers/WorkerLoaderProxy.h"
 #include "core/workers/WorkerOrWorkletGlobalScope.h"
@@ -35,10 +34,8 @@ namespace {
 // CompositorWorkerThreads.
 class TestCompositorWorkerObjectProxy : public InProcessWorkerObjectProxy {
  public:
-  static std::unique_ptr<TestCompositorWorkerObjectProxy> create(
-      ParentFrameTaskRunners* parentFrameTaskRunners) {
-    return WTF::wrapUnique(
-        new TestCompositorWorkerObjectProxy(parentFrameTaskRunners));
+  static std::unique_ptr<TestCompositorWorkerObjectProxy> create() {
+    return WTF::wrapUnique(new TestCompositorWorkerObjectProxy);
   }
 
   // (Empty) WorkerReportingProxy implementation:
@@ -57,9 +54,7 @@ class TestCompositorWorkerObjectProxy : public InProcessWorkerObjectProxy {
   void didTerminateWorkerThread() override {}
 
  private:
-  explicit TestCompositorWorkerObjectProxy(
-      ParentFrameTaskRunners* parentFrameTaskRunners)
-      : InProcessWorkerObjectProxy(nullptr, parentFrameTaskRunners) {}
+  TestCompositorWorkerObjectProxy() : InProcessWorkerObjectProxy(nullptr) {}
 };
 
 class TestCompositorWorkerProxyClient : public CompositorWorkerProxyClient {
@@ -95,9 +90,7 @@ class CompositorWorkerThreadTest : public ::testing::Test {
  public:
   void SetUp() override {
     CompositorWorkerThread::createSharedBackingThreadForTest();
-    m_parentFrameTaskRunners = ParentFrameTaskRunners::create(nullptr);
-    m_objectProxy =
-        TestCompositorWorkerObjectProxy::create(m_parentFrameTaskRunners.get());
+    m_objectProxy = TestCompositorWorkerObjectProxy::create();
     m_securityOrigin =
         SecurityOrigin::create(KURL(ParsedURLString, "http://fake.url/"));
   }
@@ -118,7 +111,7 @@ class CompositorWorkerThreadTest : public ::testing::Test {
             "//fake source code", nullptr, DontPauseWorkerGlobalScopeOnStart,
             nullptr, "", m_securityOrigin.get(), clients, WebAddressSpaceLocal,
             nullptr, nullptr, WorkerV8Settings::Default()),
-        m_parentFrameTaskRunners.get());
+        FrameTaskRunnersHolder::create(nullptr));
     return workerThread;
   }
 
@@ -146,7 +139,6 @@ class CompositorWorkerThreadTest : public ::testing::Test {
 
   RefPtr<SecurityOrigin> m_securityOrigin;
   std::unique_ptr<InProcessWorkerObjectProxy> m_objectProxy;
-  Persistent<ParentFrameTaskRunners> m_parentFrameTaskRunners;
   ScopedTestingPlatformSupport<CompositorWorkerTestPlatform> m_platform;
 };