Make ScriptController inherit LocalWindowProxyManager

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

 /*
  * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights
  * reserved.
  * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
  * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved.
  * (http://www.torchmobile.com/)
  * Copyright (C) 2008 Alp Toker <alp@atoker.com>
  * Copyright (C) Research In Motion Limited 2009. All rights reserved.
  * Copyright (C) 2011 Kris Jordan <krisjordan@gmail.com>
  * Copyright (C) 2011 Google Inc. All rights reserved.
@@ skipping 1744 matching lines @@
 void FrameLoader::runScriptsAtDocumentElementAvailable() {
   client()->runScriptsAtDocumentElementAvailable();
   // The frame might be detached at this point.
 }
 
 void FrameLoader::dispatchDidClearDocumentOfWindowObject() {
   if (!m_frame->script().canExecuteScripts(NotAboutToExecuteScript))
     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)
     return;
   AutoReset<bool> inDidClearWindowObject(
       &m_dispatchingDidClearWindowObjectInMainWorld, true);
   // We just cleared the document, not the entire window object, but for the
   // embedder that's close enough.
   client()->dispatchDidClearWindowObjectInMainWorld();
 }
@@ skipping 126 matching lines @@
                          m_documentLoader ? m_documentLoader->url() : String());
   return tracedValue;
 }
 
 inline void FrameLoader::takeObjectSnapshot() const {
   TRACE_EVENT_OBJECT_SNAPSHOT_WITH_ID("loading", "FrameLoader", this,
                                       toTracedValue());
 }
 
 }  // namespace blink