Rename Init.h to CoreInitializer.h, and InitModules.h to ModuleInitializer.h

third_party/WebKit/Source/web/WebKit.cpp

 /*
  * Copyright (C) 2009 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:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 16 matching lines @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "public/web/WebKit.h"
 
 #include "bindings/core/v8/Microtask.h"
 #include "bindings/core/v8/V8Binding.h"
 #include "bindings/core/v8/V8GCController.h"
 #include "bindings/core/v8/V8Initializer.h"
-#include "core/Init.h"
 #include "core/animation/AnimationClock.h"
 #include "core/page/Page.h"
 #include "gin/public/v8_platform.h"
-#include "modules/InitModules.h"
+#include "modules/ModulesInitializer.h"
 #include "platform/LayoutTestSupport.h"
 #include "platform/Logging.h"
 #include "platform/heap/Heap.h"
 #include "public/platform/Platform.h"
 #include "public/platform/WebThread.h"
 #include "web/IndexedDBClientImpl.h"
 #include "wtf/Assertions.h"
 #include "wtf/MainThread.h"
 #include "wtf/Partitions.h"
 #include "wtf/WTF.h"
@@ skipping 26 matching lines @@
 static ModulesInitializer& modulesInitializer()
 {
     DEFINE_STATIC_LOCAL(OwnPtr<ModulesInitializer>, initializer, (adoptPtr(new ModulesInitializer)));
     return *initializer;
 }
 
 void initialize(Platform* platform)
 {
     Platform::initialize(platform);
 
-    modulesInitializer().init();
+    modulesInitializer().initialize();
     setIndexedDBClientCreateFunction(IndexedDBClientImpl::create);
 
     V8Initializer::initializeMainThread();
 
     // currentThread is null if we are running on a thread without a message loop.
     if (WebThread* currentThread = platform->currentThread()) {
         ASSERT(!s_endOfTaskRunner);
         s_endOfTaskRunner = new EndOfTaskRunner;
         currentThread->addTaskObserver(s_endOfTaskRunner);
     }
 }
 
-v8::Isolate* mainThreadIsolate()
-{
-    return V8PerIsolateData::mainThreadIsolate();
-}
-
 void shutdown()
 {
     ThreadState::current()->cleanupMainThread();
 
     // currentThread() is null if we are running on a thread without a message loop.
     if (Platform::current()->currentThread()) {
         // We don't need to (cannot) remove s_endOfTaskRunner from the current
         // message loop, because the message loop is already destructed before
         // the shutdown() is called.
         delete s_endOfTaskRunner;
         s_endOfTaskRunner = nullptr;
     }
 
     V8Initializer::shutdownMainThread();
 
     modulesInitializer().shutdown();
 
     Platform::shutdown();
 }
 
+v8::Isolate* mainThreadIsolate()
+{
+    return V8PerIsolateData::mainThreadIsolate();
+}
+
 // TODO(tkent): The following functions to wrap LayoutTestSupport should be
 // moved to public/platform/.
 
 void setLayoutTestMode(bool value)
 {
     LayoutTestSupport::setIsRunningLayoutTest(value);
 }
 
 bool layoutTestMode()
 {
@@ skipping 39 matching lines @@
     ASSERT(!reloadPages);
     Page::refreshPlugins();
 }
 
 void decommitFreeableMemory()
 {
     WTF::Partitions::decommitFreeableMemory();
 }
 
 } // namespace blink