Move ThreadableLoader to Oilpan heap (2/3)

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 139 matching lines @@
             m_loader->cancel();
             m_loader = nullptr;
         }
     }
 
 private:
     Document& document() { return m_dummyPageHolder->document(); }
 
     std::unique_ptr<DummyPageHolder> m_dummyPageHolder;
     Checkpoint m_checkpoint;
-    std::unique_ptr<DocumentThreadableLoader> m_loader;
+    Persistent<DocumentThreadableLoader> m_loader;
 };
 
 class WorkerThreadableLoaderTestHelper : public ThreadableLoaderTestHelper, public WorkerLoaderProxyProvider {
 public:
     WorkerThreadableLoaderTestHelper()
         : m_dummyPageHolder(DummyPageHolder::create(IntSize(1, 1)))
     {
     }
 
     void createLoader(ThreadableLoaderClient* client, CrossOriginRequestPolicy crossOriginRequestPolicy) override
@@ skipping 33 matching lines @@
         DCHECK(m_workerThread->isCurrentThread());
         m_loader->cancel();
         m_loader = nullptr;
     }
 
     // Must be called on the worker thread.
     void clearLoader() override
     {
         ASSERT(m_workerThread);
         ASSERT(m_workerThread->isCurrentThread());
-        m_loader.reset();
+        m_loader = nullptr;
     }
 
     Checkpoint& checkpoint() override
     {
         return m_checkpoint;
     }
 
     void callCheckpoint(int n) override
     {
         testing::runPendingTasks();
@@ skipping 101 matching lines @@
         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.
-    std::unique_ptr<ThreadableLoader> m_loader;
+    CrossThreadPersistent<ThreadableLoader> m_loader;
 };
 
 class ThreadableLoaderTest : public ::testing::TestWithParam<ThreadableLoaderToTest> {
 public:
     ThreadableLoaderTest()
     {
         switch (GetParam()) {
         case DocumentThreadableLoaderTest:
             m_helper = wrapUnique(new DocumentThreadableLoaderTestHelper);
             break;
@@ skipping 499 matching lines @@
     EXPECT_CALL(*client(), didFailRedirectCheck()).WillOnce(InvokeWithoutArgs(this, &ThreadableLoaderTest::clearLoader));
 
     startLoader(redirectLoopURL());
     callCheckpoint(2);
     serveRequests();
 }
 
 } // namespace
 
 } // namespace blink