Shut down all threads before the main thread shuts down

third_party/WebKit/Source/core/Init.cpp

Index: third_party/WebKit/Source/core/Init.cpp
diff --git a/third_party/WebKit/Source/core/Init.cpp b/third_party/WebKit/Source/core/Init.cpp
index 886a98232d478e10dd1da5db69daf24fcd9260b4..056121830cd5b026244838e0f599b8fa1fc855b9 100644
--- a/third_party/WebKit/Source/core/Init.cpp
+++ b/third_party/WebKit/Source/core/Init.cpp
@@ -74,8 +74,8 @@ void CoreInitializer::registerEventFactory()
 
 void CoreInitializer::init()
 {
-    ASSERT(!m_isInited);
-    m_isInited = true;
+    ASSERT(!isInitialized());
+    m_isInitialized = true;
     // Note: in order to add core static strings for a new module (1)
     // the value of 'coreStaticStringsCount' must be updated with the
     // added strings count, (2) if the added strings are quialified names
@@ -143,17 +143,14 @@ void CoreInitializer::init()
     ScriptStreamerThread::init();
 }
 
-void CoreInitializer::terminateThreads()
+void CoreInitializer::shutdown()
 {
     // Make sure we stop the HTMLParserThread before Platform::current() is
     // cleared.
+    ASSERT(Platform::current());
     HTMLParserThread::shutdown();
 
     WorkerThread::terminateAndWaitForAllWorkers();
 }
 
-void CoreInitializer::shutdown()
-{
-}
-
 } // namespace blink