Refactor the Heap into ThreadHeap to prepare for per thread heaps

third_party/WebKit/Source/platform/LifecycleContextTest.cpp

 /*
  * Copyright (C) 2013 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
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 84 matching lines @@
 
 TEST(LifecycleContextTest, shouldObserveContextDestroyed)
 {
     OwnPtrWillBeRawPtr<DummyContext> context = DummyContext::create();
     OwnPtrWillBePersistent<TestingObserver> observer = TestingObserver::create(context.get());
 
     EXPECT_EQ(observer->lifecycleContext(), context.get());
     EXPECT_FALSE(observer->contextDestroyedCalled());
     context->notifyContextDestroyed();
     context = nullptr;
-    Heap::collectAllGarbage();
+    ThreadHeap::collectAllGarbage();
     EXPECT_EQ(observer->lifecycleContext(), static_cast<DummyContext*>(0));
     EXPECT_TRUE(observer->contextDestroyedCalled());
 }
 
 TEST(LifecycleContextTest, shouldNotObserveContextDestroyedIfUnobserve)
 {
     OwnPtrWillBeRawPtr<DummyContext> context = DummyContext::create();
     OwnPtrWillBePersistent<TestingObserver> observer = TestingObserver::create(context.get());
     observer->unobserve();
     context->notifyContextDestroyed();
     context = nullptr;
-    Heap::collectAllGarbage();
+    ThreadHeap::collectAllGarbage();
     EXPECT_EQ(observer->lifecycleContext(), static_cast<DummyContext*>(0));
     EXPECT_FALSE(observer->contextDestroyedCalled());
 }
 
 TEST(LifecycleContextTest, observerRemovedDuringNotifyDestroyed)
 {
     // FIXME: Oilpan: this test can be removed when the LifecycleNotifier<T>::m_observers
     // hash set is on the heap and membership is handled implicitly by the garbage collector.
     OwnPtrWillBeRawPtr<DummyContext> context = DummyContext::create();
     OwnPtrWillBePersistent<TestingObserver> observer = TestingObserver::create(context.get());
     OwnPtrWillBeRawPtr<TestingObserver> innerObserver = TestingObserver::create(context.get());
     // Attach the observer to the other. When 'observer' is notified
     // of destruction, it will remove & destroy 'innerObserver'.
     observer->setObserverToRemoveAndDestroy(innerObserver.release());
 
     EXPECT_EQ(observer->lifecycleContext(), context.get());
     EXPECT_EQ(observer->innerObserver()->lifecycleContext(), context.get());
     EXPECT_FALSE(observer->contextDestroyedCalled());
     EXPECT_FALSE(observer->innerObserver()->contextDestroyedCalled());
 
     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());
 }
 
 } // namespace blink