Revert of Move collectGarbage* methods to ThreadState

third_party/WebKit/Source/platform/scroll/ScrollAnimatorTest.cpp

Index: third_party/WebKit/Source/platform/scroll/ScrollAnimatorTest.cpp
diff --git a/third_party/WebKit/Source/platform/scroll/ScrollAnimatorTest.cpp b/third_party/WebKit/Source/platform/scroll/ScrollAnimatorTest.cpp
index b645cf3bdeb970a98e3113f03a8e4c4403272aa6..91528436215179856b26d74120dc5927639d8f93 100644
--- a/third_party/WebKit/Source/platform/scroll/ScrollAnimatorTest.cpp
+++ b/third_party/WebKit/Source/platform/scroll/ScrollAnimatorTest.cpp
@@ -213,7 +213,7 @@
     reset(*scrollAnimator);
 
     // Forced GC in order to finalize objects depending on the mock object.
-    ThreadState::current()-> collectAllGarbage();
+    ThreadHeap::collectAllGarbage();
 }
 
 TEST(ScrollAnimatorTest, MainThreadEnabled)
@@ -553,7 +553,7 @@
     reset(*scrollAnimator);
 
     // Forced GC in order to finalize objects depending on the mock object.
-    ThreadState::current()-> collectAllGarbage();
+    ThreadHeap::collectAllGarbage();
 }
 
 // This test verifies that impl only animation updates get cleared once they
@@ -588,7 +588,7 @@
     EXPECT_FALSE(animator->hasAnimationThatRequiresService());
 
     // Forced GC in order to finalize objects depending on the mock object.
-    ThreadState::current()-> collectAllGarbage();
+    ThreadHeap::collectAllGarbage();
 }
 
 TEST(ScrollAnimatorTest, MainThreadAnimationTargetAdjustment)
@@ -638,7 +638,7 @@
     reset(*animator);
 
     // Forced GC in order to finalize objects depending on the mock object.
-    ThreadState::current()-> collectAllGarbage();
+    ThreadHeap::collectAllGarbage();
 }
 
 } // namespace blink