Refactor the Heap into ThreadHeap to prepare for per thread heaps

third_party/WebKit/Source/platform/LifecycleContextTest.cpp

Index: third_party/WebKit/Source/platform/LifecycleContextTest.cpp
diff --git a/third_party/WebKit/Source/platform/LifecycleContextTest.cpp b/third_party/WebKit/Source/platform/LifecycleContextTest.cpp
index f89f0f50de186132eca85677ca5f84a11b10ee27..b3ce8e9371be1d1d526d12808991a8c83c025e9b 100644
--- a/third_party/WebKit/Source/platform/LifecycleContextTest.cpp
+++ b/third_party/WebKit/Source/platform/LifecycleContextTest.cpp
@@ -102,7 +102,7 @@ TEST(LifecycleContextTest, shouldObserveContextDestroyed)
     EXPECT_FALSE(observer->contextDestroyedCalled());
     context->notifyContextDestroyed();
     context = nullptr;
-    Heap::collectAllGarbage();
+    ThreadHeap::collectAllGarbage();
     EXPECT_EQ(observer->lifecycleContext(), static_cast<DummyContext*>(0));
     EXPECT_TRUE(observer->contextDestroyedCalled());
 }
@@ -114,7 +114,7 @@ TEST(LifecycleContextTest, shouldNotObserveContextDestroyedIfUnobserve)
     observer->unobserve();
     context->notifyContextDestroyed();
     context = nullptr;
-    Heap::collectAllGarbage();
+    ThreadHeap::collectAllGarbage();
     EXPECT_EQ(observer->lifecycleContext(), static_cast<DummyContext*>(0));
     EXPECT_FALSE(observer->contextDestroyedCalled());
 }
@@ -138,7 +138,7 @@ TEST(LifecycleContextTest, observerRemovedDuringNotifyDestroyed)
     context->notifyContextDestroyed();
     EXPECT_EQ(observer->innerObserver(), nullptr);
     context = nullptr;
-    Heap::collectAllGarbage();
+    ThreadHeap::collectAllGarbage();
     EXPECT_EQ(observer->lifecycleContext(), static_cast<DummyContext*>(0));
     EXPECT_TRUE(observer->contextDestroyedCalled());
 }