Prepare DedicatedWorker for per thread heap

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 f162eb40f57fa79fa9fc239fe3306fa725f958fd..e2d6f8f3e41eb47afa0851f374af72f19f650249 100644
--- a/third_party/WebKit/Source/core/loader/ThreadableLoaderTest.cpp
+++ b/third_party/WebKit/Source/core/loader/ThreadableLoaderTest.cpp
@@ -87,7 +87,8 @@ KURL redirectLoopURL() { return KURL(KURL(), "http://example.com/loop"); }
 
 enum ThreadableLoaderToTest {
     DocumentThreadableLoaderTest,
-    WorkerThreadableLoaderTest
+    WorkerThreadableLoaderTest,
+    PerThreadHeapEnabledWorkerThreadableLoaderTest
 };
 
 class ThreadableLoaderTestHelper {
@@ -162,8 +163,9 @@ private:
 
 class WorkerThreadableLoaderTestHelper : public ThreadableLoaderTestHelper, public WorkerLoaderProxyProvider {
 public:
-    WorkerThreadableLoaderTestHelper()
+    WorkerThreadableLoaderTestHelper(ThreadHeapMode threadHeapMode)
         : m_dummyPageHolder(DummyPageHolder::create(IntSize(1, 1)))
+        , m_threadHeapMode(threadHeapMode)
     {
     }
 
@@ -241,7 +243,8 @@ public:
         m_securityOrigin = document().getSecurityOrigin();
         m_workerThread = wrapUnique(new WorkerThreadForTest(
             this,
-            *m_mockWorkerReportingProxy));
+            *m_mockWorkerReportingProxy,
+            m_threadHeapMode));
 
         expectWorkerLifetimeReportingCalls();
         m_workerThread->startWithSourceCode(m_securityOrigin.get(), "//fake source code");
@@ -339,6 +342,7 @@ private:
     Checkpoint m_checkpoint;
     // |m_loader| must be touched only from the worker thread only.
     CrossThreadPersistent<ThreadableLoader> m_loader;
+    ThreadHeapMode m_threadHeapMode;

[nhiroki, 2016/09/21 05:32:59]

Can you add 'const' for clarifying that the heap mode is never changed during
operations.

[keishi, 2016/09/21 09:16:11]

Done.

 };
 
 class ThreadableLoaderTest : public ::testing::TestWithParam<ThreadableLoaderToTest> {
@@ -350,7 +354,10 @@ public:
             m_helper = wrapUnique(new DocumentThreadableLoaderTestHelper);
             break;
         case WorkerThreadableLoaderTest:
-            m_helper = wrapUnique(new WorkerThreadableLoaderTestHelper);
+            m_helper = wrapUnique(new WorkerThreadableLoaderTestHelper(MainThreadHeapMode));
+            break;
+        case PerThreadHeapEnabledWorkerThreadableLoaderTest:
+            m_helper = wrapUnique(new WorkerThreadableLoaderTestHelper(PerThreadHeapMode));
             break;
         }
     }
@@ -457,6 +464,10 @@ INSTANTIATE_TEST_CASE_P(Worker,
     ThreadableLoaderTest,
     ::testing::Values(WorkerThreadableLoaderTest));
 
+INSTANTIATE_TEST_CASE_P(PerThreadHeapEnabledWorker,
+    ThreadableLoaderTest,
+    ::testing::Values(PerThreadHeapEnabledWorkerThreadableLoaderTest));
+
 TEST_P(ThreadableLoaderTest, StartAndStop)
 {
 }