Make ScriptController inherit LocalWindowProxyManager

third_party/WebKit/Source/core/frame/RemoteFrame.cpp

Index: third_party/WebKit/Source/core/frame/RemoteFrame.cpp
diff --git a/third_party/WebKit/Source/core/frame/RemoteFrame.cpp b/third_party/WebKit/Source/core/frame/RemoteFrame.cpp
index 1c5816e4f2968a3a8af98592cb2011244638c58c..e8b0a0944879a587640f448a23ea11b20a5116a6 100644
--- a/third_party/WebKit/Source/core/frame/RemoteFrame.cpp
+++ b/third_party/WebKit/Source/core/frame/RemoteFrame.cpp
@@ -51,13 +51,6 @@ DEFINE_TRACE(RemoteFrame) {
   Frame::trace(visitor);
 }
 
-WindowProxy* RemoteFrame::windowProxy(DOMWrapperWorld& world) {
-  WindowProxy* windowProxy = m_windowProxyManager->windowProxy(world);
-  ASSERT(windowProxy);
-  windowProxy->initializeIfNeeded();
-  return windowProxy;
-}
-
 void RemoteFrame::navigate(Document& originDocument,
                            const KURL& url,
                            bool replaceCurrentItem,