Move LSan-specific shutdown code to ThreadState::cleanupMainThread

third_party/WebKit/Source/web/WebKit.cpp

Index: third_party/WebKit/Source/web/WebKit.cpp
diff --git a/third_party/WebKit/Source/web/WebKit.cpp b/third_party/WebKit/Source/web/WebKit.cpp
index a0341064ef2d1b6fb5a618c12c6a58b05001b5da..d71ca4d75dbb0baf0f44030bcdd665ae8859a7cc 100644
--- a/third_party/WebKit/Source/web/WebKit.cpp
+++ b/third_party/WebKit/Source/web/WebKit.cpp
@@ -158,21 +158,6 @@ void initializeWithoutV8(Platform* platform)
 
 void shutdown()
 {
-#if defined(LEAK_SANITIZER)
-    // If LSan is about to perform leak detection, release all the registered
-    // static Persistent<> root references to global caches that Blink keeps,
-    // followed by GCs to clear out all they referred to. A full v8 GC cycle
-    // is needed to flush out all garbage.
-    //
-    // This is not needed for caches over non-Oilpan objects, as they're
-    // not scanned by LSan due to being held in non-global storage
-    // ("static" references inside functions/methods.)
-    if (ThreadState* threadState = ThreadState::current()) {
-        threadState->releaseStaticPersistentNodes();
-        Heap::collectAllGarbage();
-    }
-#endif
-
     ThreadState::current()->cleanupMainThread();
 
     // currentThread() is null if we are running on a thread without a message loop.