Make ScriptController inherit LocalWindowProxyManager

third_party/WebKit/Source/core/loader/FrameLoader.cpp

Index: third_party/WebKit/Source/core/loader/FrameLoader.cpp
diff --git a/third_party/WebKit/Source/core/loader/FrameLoader.cpp b/third_party/WebKit/Source/core/loader/FrameLoader.cpp
index 0610418fd1c887b2c6234a917927ef78991a3ac6..9f9fadc502a8792baba6ee42f1d05bd9980a19d1 100644
--- a/third_party/WebKit/Source/core/loader/FrameLoader.cpp
+++ b/third_party/WebKit/Source/core/loader/FrameLoader.cpp
@@ -1762,10 +1762,8 @@ void FrameLoader::dispatchDidClearDocumentOfWindowObject() {
     return;
 
   Settings* settings = m_frame->settings();
-  if (settings && settings->getForceMainWorldInitialization()) {
-    // Forcibly instantiate WindowProxy.
-    m_frame->script().windowProxy(DOMWrapperWorld::mainWorld());
-  }
+  if (settings && settings->getForceMainWorldInitialization())
+    m_frame->script().initializeMainWorld();
   InspectorInstrumentation::didClearDocumentOfWindowObject(m_frame);
 
   if (m_dispatchingDidClearWindowObjectInMainWorld)