WorkerLoaderProxy: stop accessing cross-thread execution context

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

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #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"
 #include "core/testing/DummyPageHolder.h"
 #include "core/workers/WorkerLoaderProxy.h"
 #include "core/workers/WorkerThreadTestHelper.h"
 #include "platform/WaitableEvent.h"
 #include "platform/geometry/IntSize.h"
 #include "platform/loader/fetch/MemoryCache.h"
 #include "platform/loader/fetch/ResourceLoaderOptions.h"
@@ skipping 300 matching lines @@
   }
 
   void workerCallCheckpoint(WaitableEvent* event, int n) {
     DCHECK(m_workerThread);
     DCHECK(m_workerThread->isCurrentThread());
     m_checkpoint.Call(n);
     event->signal();
   }
 
   // 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(
       const WebTraceLocation& location,
       std::unique_ptr<WTF::CrossThreadClosure> task) override {
     DCHECK(m_workerThread);
     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;
 
   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;
@@ skipping 527 matching lines @@
   // test is not saying that didFailAccessControlCheck should be dispatched
   // synchronously, but is saying that even when a response is served
   // synchronously it should not lead to a crash.
   startLoader(KURL(KURL(), "about:blank"));
   callCheckpoint(2);
 }
 
 }  // namespace
 
 }  // namespace blink