Revert of Move collectGarbage* methods to ThreadState

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

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "platform/scroll/ScrollableArea.h"
 
 #include "platform/graphics/Color.h"
 #include "platform/graphics/GraphicsLayer.h"
 #include "platform/scroll/ScrollbarTestSuite.h"
 #include "platform/scroll/ScrollbarTheme.h"
@@ skipping 56 matching lines @@
     EXPECT_CALL(theme, shouldRepaintAllPartsOnInvalidation()).WillRepeatedly(Return(false));
     scrollbar->clearTrackNeedsRepaint();
     scrollbar->clearThumbNeedsRepaint();
     EXPECT_FALSE(scrollbar->trackNeedsRepaint());
     EXPECT_FALSE(scrollbar->thumbNeedsRepaint());
     scrollbar->setNeedsPaintInvalidation(ThumbPart);
     EXPECT_FALSE(scrollbar->trackNeedsRepaint());
     EXPECT_TRUE(scrollbar->thumbNeedsRepaint());
 
     // Forced GC in order to finalize objects depending on the mock object.
-    ThreadState::current()-> collectAllGarbage();
+    ThreadHeap::collectAllGarbage();
 }
 
 TEST_F(ScrollableAreaTest, ScrollbarGraphicsLayerInvalidation)
 {
     ScrollbarTheme::setMockScrollbarsEnabled(true);
     MockScrollableArea* scrollableArea = MockScrollableArea::create(IntPoint(0, 100));
     FakeGraphicsLayerClient graphicsLayerClient;
     graphicsLayerClient.setIsTrackingPaintInvalidations(true);
     FakeGraphicsLayer graphicsLayer(&graphicsLayerClient);
     graphicsLayer.setDrawsContent(true);
     graphicsLayer.setSize(FloatSize(111, 222));
 
     EXPECT_CALL(*scrollableArea, layerForHorizontalScrollbar()).WillRepeatedly(Return(&graphicsLayer));
 
     Scrollbar* scrollbar = Scrollbar::create(scrollableArea, HorizontalScrollbar, RegularScrollbar, nullptr);
     graphicsLayer.resetTrackedPaintInvalidations();
     scrollbar->setNeedsPaintInvalidation(NoPart);
     EXPECT_TRUE(graphicsLayer.hasTrackedPaintInvalidations());
 
     // Forced GC in order to finalize objects depending on the mock object.
-    ThreadState::current()-> collectAllGarbage();
+    ThreadHeap::collectAllGarbage();
 }
 
 TEST_F(ScrollableAreaTest, InvalidatesNonCompositedScrollbarsWhenThumbMoves)
 {
     ScrollbarThemeWithMockInvalidation theme;
     MockScrollableArea* scrollableArea = MockScrollableArea::create(IntPoint(100, 100));
     Scrollbar* horizontalScrollbar = Scrollbar::createForTesting(scrollableArea, HorizontalScrollbar, RegularScrollbar, &theme);
     Scrollbar* verticalScrollbar = Scrollbar::createForTesting(scrollableArea, VerticalScrollbar, RegularScrollbar, &theme);
     EXPECT_CALL(*scrollableArea, horizontalScrollbar()).WillRepeatedly(Return(horizontalScrollbar));
     EXPECT_CALL(*scrollableArea, verticalScrollbar()).WillRepeatedly(Return(verticalScrollbar));
@@ skipping 11 matching lines @@
     scrollableArea->setScrollPosition(DoublePoint(0, 50), ProgrammaticScroll);
     EXPECT_FALSE(scrollableArea->horizontalScrollbarNeedsPaintInvalidation());
     EXPECT_TRUE(scrollableArea->verticalScrollbarNeedsPaintInvalidation());
     scrollableArea->clearNeedsPaintInvalidationForScrollControls();
     scrollableArea->setScrollPosition(DoublePoint(50, 50), ProgrammaticScroll);
     EXPECT_TRUE(scrollableArea->horizontalScrollbarNeedsPaintInvalidation());
     EXPECT_FALSE(scrollableArea->verticalScrollbarNeedsPaintInvalidation());
     scrollableArea->clearNeedsPaintInvalidationForScrollControls();
 
     // Forced GC in order to finalize objects depending on the mock object.
-    ThreadState::current()-> collectAllGarbage();
+    ThreadHeap::collectAllGarbage();
 }
 
 TEST_F(ScrollableAreaTest, InvalidatesCompositedScrollbarsIfPartsNeedRepaint)
 {
     ScrollbarThemeWithMockInvalidation theme;
     MockScrollableArea* scrollableArea = MockScrollableArea::create(IntPoint(100, 100));
     Scrollbar* horizontalScrollbar = Scrollbar::createForTesting(scrollableArea, HorizontalScrollbar, RegularScrollbar, &theme);
     horizontalScrollbar->clearTrackNeedsRepaint();
     horizontalScrollbar->clearThumbNeedsRepaint();
     Scrollbar* verticalScrollbar = Scrollbar::createForTesting(scrollableArea, VerticalScrollbar, RegularScrollbar, &theme);
@@ skipping 46 matching lines @@
     EXPECT_CALL(theme, invalidateOnThumbPositionChange(_, _, _)).Times(2).WillRepeatedly(Return(NoPart));
     scrollableArea->setScrollPosition(DoublePoint(70, 70), ProgrammaticScroll);
     EXPECT_TRUE(layerForHorizontalScrollbar.hasTrackedPaintInvalidations());
     EXPECT_TRUE(layerForVerticalScrollbar.hasTrackedPaintInvalidations());
     EXPECT_FALSE(horizontalScrollbar->trackNeedsRepaint());
     EXPECT_FALSE(horizontalScrollbar->thumbNeedsRepaint());
     EXPECT_FALSE(verticalScrollbar->trackNeedsRepaint());
     EXPECT_FALSE(verticalScrollbar->thumbNeedsRepaint());
 
     // Forced GC in order to finalize objects depending on the mock object.
-    ThreadState::current()-> collectAllGarbage();
+    ThreadHeap::collectAllGarbage();
 }
 
 TEST_F(ScrollableAreaTest, RecalculatesScrollbarOverlayIfBackgroundChanges)
 {
     MockScrollableArea* scrollableArea = MockScrollableArea::create(IntPoint(0, 100));
 
     EXPECT_EQ(ScrollbarOverlayStyleDefault, scrollableArea->getScrollbarOverlayStyle());
     scrollableArea->recalculateScrollbarOverlayStyle(Color(34, 85, 51));
     EXPECT_EQ(ScrollbarOverlayStyleLight, scrollableArea->getScrollbarOverlayStyle());
     scrollableArea->recalculateScrollbarOverlayStyle(Color(236, 143, 185));
     EXPECT_EQ(ScrollbarOverlayStyleDefault, scrollableArea->getScrollbarOverlayStyle());
 }
 
 } // namespace blink