Refactor the Heap into ThreadHeap to prepare for per thread heaps

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

Index: third_party/WebKit/Source/platform/scroll/ScrollableAreaTest.cpp
diff --git a/third_party/WebKit/Source/platform/scroll/ScrollableAreaTest.cpp b/third_party/WebKit/Source/platform/scroll/ScrollableAreaTest.cpp
index ee962d9a767b5e24094048fbf2bae84d5d69160b..4abae384d6b58f5f8d79003bebc814c44d3c1514 100644
--- a/third_party/WebKit/Source/platform/scroll/ScrollableAreaTest.cpp
+++ b/third_party/WebKit/Source/platform/scroll/ScrollableAreaTest.cpp
@@ -143,7 +143,7 @@ TEST_F(ScrollableAreaTest, ScrollbarTrackAndThumbRepaint)
     EXPECT_TRUE(scrollbar->thumbNeedsRepaint());
 
     // Forced GC in order to finalize objects depending on the mock object.
-    Heap::collectAllGarbage();
+    ThreadHeap::collectAllGarbage();
 }
 
 class MockGraphicsLayerClient : public GraphicsLayerClient {
@@ -176,7 +176,7 @@ TEST_F(ScrollableAreaTest, ScrollbarGraphicsLayerInvalidation)
     EXPECT_TRUE(graphicsLayer.hasTrackedPaintInvalidations());
 
     // Forced GC in order to finalize objects depending on the mock object.
-    Heap::collectAllGarbage();
+    ThreadHeap::collectAllGarbage();
 }
 
 TEST_F(ScrollableAreaTest, InvalidatesNonCompositedScrollbarsWhenThumbMoves)
@@ -208,7 +208,7 @@ TEST_F(ScrollableAreaTest, InvalidatesNonCompositedScrollbarsWhenThumbMoves)
     scrollableArea->clearNeedsPaintInvalidationForScrollControls();
 
     // Forced GC in order to finalize objects depending on the mock object.
-    Heap::collectAllGarbage();
+    ThreadHeap::collectAllGarbage();
 }
 
 TEST_F(ScrollableAreaTest, InvalidatesCompositedScrollbarsIfPartsNeedRepaint)
@@ -274,7 +274,7 @@ TEST_F(ScrollableAreaTest, InvalidatesCompositedScrollbarsIfPartsNeedRepaint)
     EXPECT_FALSE(verticalScrollbar->thumbNeedsRepaint());
 
     // Forced GC in order to finalize objects depending on the mock object.
-    Heap::collectAllGarbage();
+    ThreadHeap::collectAllGarbage();
 }
 
 TEST_F(ScrollableAreaTest, RecalculatesScrollbarOverlayIfBackgroundChanges)