Revert of Move collectGarbage* methods to ThreadState

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

 /*
  * Copyright (C) 2010 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
@@ skipping 195 matching lines @@
 
     // Idle
     scrollAnimator->updateCompositorAnimations();
     scrollAnimator->tickAnimation(getMockedTime());
     EXPECT_EQ(scrollAnimator->m_runState,
         ScrollAnimatorCompositorCoordinator::RunState::Idle);
 
     reset(*scrollAnimator);
 
     // Forced GC in order to finalize objects depending on the mock object.
-    ThreadState::current()-> collectAllGarbage();
+    ThreadHeap::collectAllGarbage();
 }
 
 TEST(ScrollAnimatorTest, MainThreadEnabled)
 {
     MockScrollableArea* scrollableArea = MockScrollableArea::create(true);
     ScrollAnimator* scrollAnimator = new ScrollAnimator(scrollableArea, getMockedTime);
 
     EXPECT_CALL(*scrollableArea, minimumScrollPosition()).Times(AtLeast(1)).WillRepeatedly(Return(IntPoint()));
     EXPECT_CALL(*scrollableArea, maximumScrollPosition()).Times(AtLeast(1)).WillRepeatedly(Return(IntPoint(1000, 1000)));
     EXPECT_CALL(*scrollableArea, setScrollOffset(_, _)).Times(9);
@@ skipping 319 matching lines @@
     EXPECT_TRUE(scrollAnimator->hasAnimationThatRequiresService());
     EXPECT_TRUE(result.didScrollX);
     EXPECT_FLOAT_EQ(0.0, result.unusedScrollDeltaX);
     EXPECT_EQ(scrollAnimator->m_runState,
         ScrollAnimatorCompositorCoordinator::RunState::RunningOnCompositorButNeedsUpdate);
     EXPECT_EQ(250, scrollAnimator->desiredTargetPosition().x());
     EXPECT_EQ(0, scrollAnimator->desiredTargetPosition().y());
     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
 // are pushed to compositor animation host.
 TEST(ScrollAnimatorTest, ImplOnlyAnimationUpdatesCleared)
 {
     MockScrollableArea* scrollableArea = MockScrollableArea::create(true);
     TestScrollAnimator* animator = new TestScrollAnimator(scrollableArea, getMockedTime);
 
     // From calls to adjust/takeoverImplOnlyScrollOffsetAnimation.
@@ skipping 14 matching lines @@
 
     EXPECT_EQ(animator->m_runState, ScrollAnimatorCompositorCoordinator::RunState::Idle);
     EXPECT_FALSE(animator->hasAnimationThatRequiresService());
     EXPECT_TRUE(animator->implOnlyAnimationAdjustmentForTesting().isZero());
 
     // Verify that the takeover update is cleared.
     animator->takeOverImplOnlyScrollOffsetAnimation();
     EXPECT_FALSE(animator->hasAnimationThatRequiresService());
 
     // Forced GC in order to finalize objects depending on the mock object.
-    ThreadState::current()-> collectAllGarbage();
+    ThreadHeap::collectAllGarbage();
 }
 
 TEST(ScrollAnimatorTest, MainThreadAnimationTargetAdjustment)
 {
     MockScrollableArea* scrollableArea = MockScrollableArea::create(true);
     ScrollAnimator* animator = new ScrollAnimator(scrollableArea, getMockedTime);
     scrollableArea->setScrollAnimator(animator);
 
     EXPECT_CALL(*scrollableArea, minimumScrollPosition()).Times(AtLeast(1))
         .WillRepeatedly(Return(IntPoint(-100, -100)));
@@ skipping 29 matching lines @@
     EXPECT_EQ(FloatPoint(110, 90), animator->desiredTargetPosition());
 
     // Animation finished
     gMockedTime += 1.0;
     animator->updateCompositorAnimations();
     animator->tickAnimation(getMockedTime());
     EXPECT_EQ(FloatPoint(110, 90), animator->currentPosition());
     reset(*animator);
 
     // Forced GC in order to finalize objects depending on the mock object.
-    ThreadState::current()-> collectAllGarbage();
+    ThreadHeap::collectAllGarbage();
 }
 
 } // namespace blink