Oilpan: HeapTest: FinalizationObserverWithHashMap should not leave a Persistent object.

Source/platform/heap/HeapTest.cpp

Index: Source/platform/heap/HeapTest.cpp
diff --git a/Source/platform/heap/HeapTest.cpp b/Source/platform/heap/HeapTest.cpp
index 9dcfd8d19d3ea408a74076f1fe0ce33f77ed4ee9..6e7e0052f2196816cda7ca33fb6a49245921d419 100644
--- a/Source/platform/heap/HeapTest.cpp
+++ b/Source/platform/heap/HeapTest.cpp
@@ -1114,21 +1114,28 @@ public:
         return map;
     }
 
+    static void clearObservers()
+    {
+        delete s_observerMap;
+        s_observerMap = nullptr;
+    }
+
     static bool s_didCallWillFinalize;
 
 private:
     static ObserverMap& observers()
     {
-        DEFINE_STATIC_LOCAL(Persistent<ObserverMap>, observerMap, ());
-        if (!observerMap)
-            observerMap = new ObserverMap();
-        return *observerMap;
+        if (!s_observerMap)
+            s_observerMap = new Persistent<ObserverMap>(new ObserverMap());
+        return **s_observerMap;
     }
 
     Observable& m_target;
+    static Persistent<ObserverMap>* s_observerMap;
 };
 
 bool FinalizationObserverWithHashMap::s_didCallWillFinalize = false;
+Persistent<FinalizationObserverWithHashMap::ObserverMap>* FinalizationObserverWithHashMap::s_observerMap;
 
 class SuperClass;
 
@@ -3311,6 +3318,8 @@ TEST(HeapTest, FinalizationObserver)
     EXPECT_EQ(0u, Bar::s_live);
     EXPECT_EQ(0u, map.size());
     EXPECT_TRUE(FinalizationObserverWithHashMap::s_didCallWillFinalize);
+
+    FinalizationObserverWithHashMap::clearObservers();
 }
 
 TEST(HeapTest, PreFinalizer)