Propagate proper FROM_HERE to postTask() in worker code

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/CrossThreadTask.h"
 #include "core/fetch/MemoryCache.h"
 #include "core/fetch/ResourceLoaderOptions.h"
 #include "core/loader/DocumentThreadableLoader.h"
@@ skipping 152 matching lines @@
 class WorkerThreadableLoaderTestHelper : public ThreadableLoaderTestHelper, public WorkerLoaderProxyProvider {
 public:
     WorkerThreadableLoaderTestHelper()
         : m_dummyPageHolder(DummyPageHolder::create(IntSize(1, 1)))
     {
     }
 
     void createLoader(ThreadableLoaderClient* client, CrossOriginRequestPolicy crossOriginRequestPolicy) override
     {
         std::unique_ptr<WaitableEvent> completionEvent = wrapUnique(new WaitableEvent());
-        postTaskToWorkerGlobalScope(createCrossThreadTask(
-            &WorkerThreadableLoaderTestHelper::workerCreateLoader,
-            crossThreadUnretained(this),
-            crossThreadUnretained(client),
-            crossThreadUnretained(completionEvent.get()),
-            crossOriginRequestPolicy));
+        postTaskToWorkerGlobalScope(BLINK_FROM_HERE,
+            createCrossThreadTask(
+                &WorkerThreadableLoaderTestHelper::workerCreateLoader,
+                crossThreadUnretained(this),
+                crossThreadUnretained(client),
+                crossThreadUnretained(completionEvent.get()),
+                crossOriginRequestPolicy));
         completionEvent->wait();
     }
 
     void startLoader(const ResourceRequest& request) override
     {
         std::unique_ptr<WaitableEvent> completionEvent = wrapUnique(new WaitableEvent());
-        postTaskToWorkerGlobalScope(createCrossThreadTask(
-            &WorkerThreadableLoaderTestHelper::workerStartLoader,
-            crossThreadUnretained(this),
-            crossThreadUnretained(completionEvent.get()),
-            request));
+        postTaskToWorkerGlobalScope(BLINK_FROM_HERE,
+            createCrossThreadTask(
+                &WorkerThreadableLoaderTestHelper::workerStartLoader,
+                crossThreadUnretained(this),
+                crossThreadUnretained(completionEvent.get()),
+                request));
         completionEvent->wait();
     }
 
     // Must be called on the worker thread.
     void cancelLoader() override
     {
         ASSERT(m_workerThread);
         ASSERT(m_workerThread->isCurrentThread());
         m_loader->cancel();
     }
@@ skipping 17 matching lines @@
     Checkpoint& checkpoint() override
     {
         return m_checkpoint;
     }
 
     void callCheckpoint(int n) override
     {
         testing::runPendingTasks();
 
         std::unique_ptr<WaitableEvent> completionEvent = wrapUnique(new WaitableEvent());
-        postTaskToWorkerGlobalScope(createCrossThreadTask(
-            &WorkerThreadableLoaderTestHelper::workerCallCheckpoint,
-            crossThreadUnretained(this),
-            crossThreadUnretained(completionEvent.get()),
-            n));
+        postTaskToWorkerGlobalScope(BLINK_FROM_HERE,
+            createCrossThreadTask(
+                &WorkerThreadableLoaderTestHelper::workerCallCheckpoint,
+                crossThreadUnretained(this),
+                crossThreadUnretained(completionEvent.get()),
+                n));
         completionEvent->wait();
     }
 
     void onSetUp() override
     {
         m_mockWorkerReportingProxy = wrapUnique(new MockWorkerReportingProxy());
         m_securityOrigin = document().getSecurityOrigin();
         m_workerThread = wrapUnique(new WorkerThreadForTest(
             this,
             *m_mockWorkerReportingProxy));
 
         expectWorkerLifetimeReportingCalls();
         m_workerThread->startWithSourceCode(m_securityOrigin.get(), "//fake source code");
         m_workerThread->waitForInit();
     }
 
     void onServeRequests() override
     {
         testing::runPendingTasks();
     }
 
     void onTearDown() override
     {
-        postTaskToWorkerGlobalScope(createCrossThreadTask(&WorkerThreadableLoaderTestHelper::clearLoader, crossThreadUnretained(this)));
+        postTaskToWorkerGlobalScope(BLINK_FROM_HERE, createCrossThreadTask(&WorkerThreadableLoaderTestHelper::clearLoader, crossThreadUnretained(this)));
         m_workerThread->terminateAndWait();
 
         // Needed to clean up the things on the main thread side and
         // avoid Resource leaks.
         testing::runPendingTasks();
 
         m_workerThread->workerLoaderProxy()->detachProvider(this);
     }
 
 private:
@@ skipping 39 matching lines @@
 
     void workerCallCheckpoint(WaitableEvent* event, int n)
     {
         ASSERT(m_workerThread);
         ASSERT(m_workerThread->isCurrentThread());
         m_checkpoint.Call(n);
         event->signal();
     }
 
     // WorkerLoaderProxyProvider methods.
-    void postTaskToLoader(std::unique_ptr<ExecutionContextTask> task) override
+    void postTaskToLoader(const WebTraceLocation& location, std::unique_ptr<ExecutionContextTask> task) override
     {
         ASSERT(m_workerThread);
         ASSERT(m_workerThread->isCurrentThread());
-        document().postTask(BLINK_FROM_HERE, std::move(task));
+        document().postTask(location, std::move(task));
     }
 
-    bool postTaskToWorkerGlobalScope(std::unique_ptr<ExecutionContextTask> task) override
+    bool postTaskToWorkerGlobalScope(const WebTraceLocation& location, std::unique_ptr<ExecutionContextTask> task) override
     {
         ASSERT(m_workerThread);
-        m_workerThread->postTask(BLINK_FROM_HERE, std::move(task));
+        m_workerThread->postTask(location, std::move(task));
         return true;
     }
 
     RefPtr<SecurityOrigin> m_securityOrigin;
     std::unique_ptr<MockWorkerReportingProxy> m_mockWorkerReportingProxy;
     std::unique_ptr<WorkerThreadForTest> m_workerThread;
 
     std::unique_ptr<DummyPageHolder> m_dummyPageHolder;
     Checkpoint m_checkpoint;
     // |m_loader| must be touched only from the worker thread only.
@@ skipping 510 matching lines @@
     EXPECT_CALL(*client(), didFailRedirectCheck()).WillOnce(InvokeWithoutArgs(this, &ThreadableLoaderTest::clearLoader));
 
     startLoader(redirectLoopURL());
     callCheckpoint(2);
     serveRequests();
 }
 
 } // namespace
 
 } // namespace blink