bindings: Simplifies WindowProxyManager and its relation to Frame.

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 d04e31245a6546a9ae759e8e7aba8b87a28f3e69..7eaddcd231888e74336994db10170722f3870a39 100644
--- a/third_party/WebKit/Source/core/frame/RemoteFrame.cpp
+++ b/third_party/WebKit/Source/core/frame/RemoteFrame.cpp
@@ -28,9 +28,8 @@ namespace blink {
 inline RemoteFrame::RemoteFrame(RemoteFrameClient* client,
                                 FrameHost* host,
                                 FrameOwner* owner)
-    : Frame(client, host, owner),
-      m_securityContext(RemoteSecurityContext::create()),
-      m_windowProxyManager(RemoteWindowProxyManager::create(*this)) {
+    : Frame(client, host, owner, RemoteWindowProxyManager::create(*this)),
+      m_securityContext(RemoteSecurityContext::create()) {
   m_domWindow = RemoteDOMWindow::create(*this);
 }
 
@@ -47,17 +46,9 @@ RemoteFrame::~RemoteFrame() {
 DEFINE_TRACE(RemoteFrame) {
   visitor->trace(m_view);
   visitor->trace(m_securityContext);
-  visitor->trace(m_windowProxyManager);
   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,
@@ -101,7 +92,7 @@ void RemoteFrame::detach(FrameDetachType type) {
   if (m_view)
     m_view->dispose();
   client()->willBeDetached();
-  m_windowProxyManager->clearForClose();
+  getWindowProxyManager()->clearForClose();
   setView(nullptr);
   // ... the RemoteDOMWindow will need to be informed of detachment,
   // as otherwise it will keep a strong reference back to this RemoteFrame.
@@ -172,10 +163,6 @@ void RemoteFrame::advanceFocus(WebFocusType type, LocalFrame* source) {
   client()->advanceFocus(type, source);
 }
 
-WindowProxyManagerBase* RemoteFrame::getWindowProxyManager() const {
-  return m_windowProxyManager.get();
-}
-
 void RemoteFrame::detachChildren() {
   using FrameVector = HeapVector<Member<Frame>>;
   FrameVector childrenToDetach;