WorkerLoaderProxy: stop accessing cross-thread execution context

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 fdaaf3f39be0df5949ba1f944bec40d991c6f524..6f23acd87d90d83daeb68c080cc522190dc39f25 100644
--- a/third_party/WebKit/Source/core/loader/ThreadableLoaderTest.cpp
+++ b/third_party/WebKit/Source/core/loader/ThreadableLoaderTest.cpp
@@ -4,7 +4,6 @@
 
 #include "core/loader/ThreadableLoader.h"
 
-#include "core/dom/ExecutionContextTask.h"
 #include "core/loader/DocumentThreadableLoader.h"
 #include "core/loader/ThreadableLoaderClient.h"
 #include "core/loader/WorkerThreadableLoader.h"
@@ -325,16 +324,13 @@ class WorkerThreadableLoaderTestHelper : public ThreadableLoaderTestHelper,
   }
 
   // WorkerLoaderProxyProvider methods.
-  void postTaskToLoader(const WebTraceLocation& location,
-                        std::unique_ptr<ExecutionContextTask> task) override {
+  void postTaskToLoader(
+      const WebTraceLocation& location,
+      std::unique_ptr<WTF::CrossThreadClosure> task) override {
     DCHECK(m_workerThread);
     DCHECK(m_workerThread->isCurrentThread());
     m_parentFrameTaskRunners->get(TaskType::Networking)
-        ->postTask(
-            BLINK_FROM_HERE,
-            crossThreadBind(&ExecutionContextTask::performTaskIfContextIsValid,
-                            WTF::passed(std::move(task)),
-                            wrapCrossThreadWeakPersistent(&document())));
+        ->postTask(BLINK_FROM_HERE, std::move(task));
   }
 
   void postTaskToWorkerGlobalScope(
@@ -344,6 +340,8 @@ class WorkerThreadableLoaderTestHelper : public ThreadableLoaderTestHelper,
     m_workerThread->postTask(location, std::move(task));
   }
 
+  ExecutionContext* getLoaderExecutionContext() override { return &document(); }
+
   RefPtr<SecurityOrigin> m_securityOrigin;
   std::unique_ptr<MockWorkerReportingProxy> m_mockWorkerReportingProxy;
   std::unique_ptr<WorkerThreadForTest> m_workerThread;