Create RenderFrameProxyHost at time of swap-out instead of commit.

content/browser/frame_host/render_frame_host_impl.cc

Index: content/browser/frame_host/render_frame_host_impl.cc
diff --git a/content/browser/frame_host/render_frame_host_impl.cc b/content/browser/frame_host/render_frame_host_impl.cc
index a5ff5cdcd4a29898e5344cda5b1777c0d969d2ed..6cff7bc8a7829412ab3d432ab568b3c1b816dcc1 100644
--- a/content/browser/frame_host/render_frame_host_impl.cc
+++ b/content/browser/frame_host/render_frame_host_impl.cc
@@ -15,6 +15,7 @@
 #include "content/browser/frame_host/frame_tree_node.h"
 #include "content/browser/frame_host/navigator.h"
 #include "content/browser/frame_host/render_frame_host_delegate.h"
+#include "content/browser/frame_host/render_frame_proxy_host.h"
 #include "content/browser/renderer_host/input/input_router.h"
 #include "content/browser/renderer_host/input/timeout_monitor.h"
 #include "content/browser/renderer_host/render_view_host_impl.h"
@@ -148,6 +149,7 @@ RenderFrameHostImpl::RenderFrameHostImpl(
     : render_view_host_(render_view_host),
       delegate_(delegate),
       cross_process_frame_connector_(NULL),
+      render_frame_proxy_host_(NULL),
       frame_tree_(frame_tree),
       frame_tree_node_(frame_tree_node),
       routing_id_(routing_id),
@@ -244,6 +246,11 @@ bool RenderFrameHostImpl::Send(IPC::Message* message) {
         make_scoped_ptr(message));
   }
 
+  if (render_view_host_->IsSwappedOut()) {

[ncarter (slow), 2014/05/15 20:49:45]

What guarantees that all frames sharing a RVH are swapped out at the same
moment? (Given how it's used here, I expected the IsSwappedOut state to be an
attribute of the RFH, not the RVH.)

[nasko, 2014/05/15 20:53:45]

Prior to frame tree replication, we always have only one RenderFrameHostImpl for
a swapped out RenderViewHostImpl. This will change once we start replicating the
frame tree, but so will this check.

+    DCHECK(render_frame_proxy_host_);
+    return render_frame_proxy_host_->Send(message);
+  }
+
   return GetProcess()->Send(message);
 }
 
@@ -508,7 +515,7 @@ void RenderFrameHostImpl::OnCrossSiteResponse(
       should_replace_current_entry);
 }
 
-void RenderFrameHostImpl::SwapOut() {
+void RenderFrameHostImpl::SwapOut(RenderFrameProxyHost* proxy) {
   // TODO(creis): Move swapped out state to RFH.  Until then, only update it
   // when swapping out the main frame.
   if (!GetParent()) {
@@ -524,8 +531,10 @@ void RenderFrameHostImpl::SwapOut() {
             RenderViewHostImpl::kUnloadTimeoutMS));
   }
 
+  set_render_frame_proxy_host(proxy);
+
   if (render_view_host_->IsRenderViewLive())
-    Send(new FrameMsg_SwapOut(routing_id_));
+    Send(new FrameMsg_SwapOut(routing_id_, proxy->GetRoutingID()));
 
   if (!GetParent())
     delegate_->SwappedOut(this);