Refactor the Heap into ThreadHeap to prepare for per thread heaps

third_party/WebKit/Source/core/editing/markers/DocumentMarkerControllerTest.cpp

Index: third_party/WebKit/Source/core/editing/markers/DocumentMarkerControllerTest.cpp
diff --git a/third_party/WebKit/Source/core/editing/markers/DocumentMarkerControllerTest.cpp b/third_party/WebKit/Source/core/editing/markers/DocumentMarkerControllerTest.cpp
index 07f81c726f640387291abd49e11fa6d08a78475e..071a97610cb0f992f74d23ff0e12489bc54a0f9c 100644
--- a/third_party/WebKit/Source/core/editing/markers/DocumentMarkerControllerTest.cpp
+++ b/third_party/WebKit/Source/core/editing/markers/DocumentMarkerControllerTest.cpp
@@ -101,7 +101,7 @@ TEST_F(DocumentMarkerControllerTest, DidMoveToNewDocument)
     anotherDocument->adoptNode(parent.get(), ASSERT_NO_EXCEPTION);
 
     // No more reference to marked node.
-    Heap::collectAllGarbage();
+    ThreadHeap::collectAllGarbage();
     EXPECT_EQ(0u, markerController().markers().size());
     EXPECT_EQ(0u, anotherDocument->markers().markers().size());
 }
@@ -117,7 +117,7 @@ TEST_F(DocumentMarkerControllerTest, NodeWillBeRemovedMarkedByNormalize)
         parent->normalize();
     }
     // No more reference to marked node.
-    Heap::collectAllGarbage();
+    ThreadHeap::collectAllGarbage();
     EXPECT_EQ(1u, markerController().markers().size());
 }
 
@@ -129,7 +129,7 @@ TEST_F(DocumentMarkerControllerTest, NodeWillBeRemovedMarkedByRemoveChildren)
     EXPECT_EQ(1u, markerController().markers().size());
     parent->removeChildren();
     // No more reference to marked node.
-    Heap::collectAllGarbage();
+    ThreadHeap::collectAllGarbage();
     EXPECT_EQ(0u, markerController().markers().size());
 }
 
@@ -143,7 +143,7 @@ TEST_F(DocumentMarkerControllerTest, NodeWillBeRemovedByRemoveMarked)
         parent->removeChild(parent->firstChild());
     }
     // No more reference to marked node.
-    Heap::collectAllGarbage();
+    ThreadHeap::collectAllGarbage();
     EXPECT_EQ(0u, markerController().markers().size());
 }
 
@@ -157,7 +157,7 @@ TEST_F(DocumentMarkerControllerTest, NodeWillBeRemovedMarkedByRemoveAncestor)
         parent->parentNode()->parentNode()->removeChild(parent->parentNode());
     }
     // No more reference to marked node.
-    Heap::collectAllGarbage();
+    ThreadHeap::collectAllGarbage();
     EXPECT_EQ(0u, markerController().markers().size());
 }
 
@@ -171,7 +171,7 @@ TEST_F(DocumentMarkerControllerTest, NodeWillBeRemovedMarkedByRemoveParent)
         parent->parentNode()->removeChild(parent.get());
     }
     // No more reference to marked node.
-    Heap::collectAllGarbage();
+    ThreadHeap::collectAllGarbage();
     EXPECT_EQ(0u, markerController().markers().size());
 }
 
@@ -185,7 +185,7 @@ TEST_F(DocumentMarkerControllerTest, NodeWillBeRemovedMarkedByReplaceChild)
         parent->replaceChild(createTextNode("bar").get(), parent->firstChild());
     }
     // No more reference to marked node.
-    Heap::collectAllGarbage();
+    ThreadHeap::collectAllGarbage();
     EXPECT_EQ(0u, markerController().markers().size());
 }
 
@@ -199,7 +199,7 @@ TEST_F(DocumentMarkerControllerTest, NodeWillBeRemovedBySetInnerHTML)
         setBodyInnerHTML("");
     }
     // No more reference to marked node.
-    Heap::collectAllGarbage();
+    ThreadHeap::collectAllGarbage();
     EXPECT_EQ(0u, markerController().markers().size());
 }