Move collectGarbage* methods to ThreadState

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 d8ea19ddabcefdb9b5c1ce04c38be6ad5d4f8037..e3708762cef5de24197504d235f7e075fed674ed 100644
--- a/third_party/WebKit/Source/core/editing/markers/DocumentMarkerControllerTest.cpp
+++ b/third_party/WebKit/Source/core/editing/markers/DocumentMarkerControllerTest.cpp
@@ -102,7 +102,7 @@ TEST_F(DocumentMarkerControllerTest, DidMoveToNewDocument)
     anotherDocument->adoptNode(parent, ASSERT_NO_EXCEPTION);
 
     // No more reference to marked node.
-    ThreadHeap::collectAllGarbage();
+    ThreadState::current()-> collectAllGarbage();
     EXPECT_EQ(0u, markerController().markers().size());
     EXPECT_EQ(0u, anotherDocument->markers().markers().size());
 }
@@ -118,7 +118,7 @@ TEST_F(DocumentMarkerControllerTest, NodeWillBeRemovedMarkedByNormalize)
         parent->normalize();
     }
     // No more reference to marked node.
-    ThreadHeap::collectAllGarbage();
+    ThreadState::current()-> collectAllGarbage();
     EXPECT_EQ(1u, markerController().markers().size());
 }
 
@@ -130,7 +130,7 @@ TEST_F(DocumentMarkerControllerTest, NodeWillBeRemovedMarkedByRemoveChildren)
     EXPECT_EQ(1u, markerController().markers().size());
     parent->removeChildren();
     // No more reference to marked node.
-    ThreadHeap::collectAllGarbage();
+    ThreadState::current()-> collectAllGarbage();
     EXPECT_EQ(0u, markerController().markers().size());
 }
 
@@ -144,7 +144,7 @@ TEST_F(DocumentMarkerControllerTest, NodeWillBeRemovedByRemoveMarked)
         parent->removeChild(parent->firstChild());
     }
     // No more reference to marked node.
-    ThreadHeap::collectAllGarbage();
+    ThreadState::current()-> collectAllGarbage();
     EXPECT_EQ(0u, markerController().markers().size());
 }
 
@@ -158,7 +158,7 @@ TEST_F(DocumentMarkerControllerTest, NodeWillBeRemovedMarkedByRemoveAncestor)
         parent->parentNode()->parentNode()->removeChild(parent->parentNode());
     }
     // No more reference to marked node.
-    ThreadHeap::collectAllGarbage();
+    ThreadState::current()-> collectAllGarbage();
     EXPECT_EQ(0u, markerController().markers().size());
 }
 
@@ -172,7 +172,7 @@ TEST_F(DocumentMarkerControllerTest, NodeWillBeRemovedMarkedByRemoveParent)
         parent->parentNode()->removeChild(parent);
     }
     // No more reference to marked node.
-    ThreadHeap::collectAllGarbage();
+    ThreadState::current()-> collectAllGarbage();
     EXPECT_EQ(0u, markerController().markers().size());
 }
 
@@ -186,7 +186,7 @@ TEST_F(DocumentMarkerControllerTest, NodeWillBeRemovedMarkedByReplaceChild)
         parent->replaceChild(createTextNode("bar"), parent->firstChild());
     }
     // No more reference to marked node.
-    ThreadHeap::collectAllGarbage();
+    ThreadState::current()-> collectAllGarbage();
     EXPECT_EQ(0u, markerController().markers().size());
 }
 
@@ -200,7 +200,7 @@ TEST_F(DocumentMarkerControllerTest, NodeWillBeRemovedBySetInnerHTML)
         setBodyInnerHTML("");
     }
     // No more reference to marked node.
-    ThreadHeap::collectAllGarbage();
+    ThreadState::current()-> collectAllGarbage();
     EXPECT_EQ(0u, markerController().markers().size());
 }