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

content/browser/frame_host/render_frame_host_impl.h

Index: content/browser/frame_host/render_frame_host_impl.h
diff --git a/content/browser/frame_host/render_frame_host_impl.h b/content/browser/frame_host/render_frame_host_impl.h
index a0fb3327ff2b6b81ac3bb5b0144d17057648ffea..1347e355b657706b3893a4e98f46c2003981cbf9 100644
--- a/content/browser/frame_host/render_frame_host_impl.h
+++ b/content/browser/frame_host/render_frame_host_impl.h
@@ -36,6 +36,7 @@ class CrossSiteTransferringRequest;
 class FrameTree;
 class FrameTreeNode;
 class RenderFrameHostDelegate;
+class RenderFrameProxyHost;
 class RenderProcessHost;
 class RenderViewHostImpl;
 struct ContextMenuParams;
@@ -92,6 +93,10 @@ class CONTENT_EXPORT RenderFrameHostImpl : public RenderFrameHost {
     cross_process_frame_connector_ = cross_process_frame_connector;
   }
 
+  void set_render_frame_proxy(RenderFrameProxyHost* proxy) {

[Charlie Reis, 2014/05/15 00:32:50]

nit: set_render_frame_proxy_host

[nasko, 2014/05/15 18:47:13]

Done.

+    render_frame_proxy_ = proxy;
+  }
+
   // Returns a bitwise OR of bindings types that have been enabled for this
   // RenderFrameHostImpl's RenderView. See BindingsPolicy for details.
   // TODO(creis): Make bindings frame-specific, to support cases like <webview>.
@@ -115,7 +120,7 @@ class CONTENT_EXPORT RenderFrameHostImpl : public RenderFrameHost {
   // exits, in case we come back.  The renderer can exit if it has no other
   // active RenderFrames, but not until WasSwappedOut is called (when it is no
   // longer visible).
-  void SwapOut();
+  void SwapOut(RenderFrameProxyHost* proxy);

[Charlie Reis, 2014/05/15 00:32:50]

Can you mention what |proxy| is for in the comment, and whether we expect its
corresponding RenderFrameProxy to exist in the renderer at the time this is
called?

[nasko, 2014/05/15 18:47:13]

Done.

 
   void OnSwappedOut(bool timed_out);
   bool is_swapped_out() { return is_swapped_out_; }
@@ -261,6 +266,12 @@ class CONTENT_EXPORT RenderFrameHostImpl : public RenderFrameHost {
   // This will move to RenderFrameProxyHost when that class is created.
   CrossProcessFrameConnector* cross_process_frame_connector_;
 
+  // The proxy created for this RenderFrameHost. It is used to send and receive
+  // IPC messages while in swapped out state.
+  // TODO(nasko): This can be removed once we don't use swapping out of

[Charlie Reis, 2014/05/15 00:32:50]

There are a lot of comments like this, but the wording doesn't feel right to me.
 We should instead say something like "...once we don't have a swapped out state
on RenderFrameHosts," and cite http://crbug.com/357747.  Can you update the
others as well?

[nasko, 2014/05/15 18:47:13]

Done.

+  // RenderFrameHost objects.
+  RenderFrameProxyHost* render_frame_proxy_;

[Charlie Reis, 2014/05/15 00:32:50]

nit: render_frame_proxy_host_

That's more consistent with mentioning "host" in render_view_host_, and it's a
bit clearer to others trying to understand which object lives where.

[nasko, 2014/05/15 18:47:13]

Done.

+
   // Reference to the whole frame tree that this RenderFrameHost belongs to.
   // Allows this RenderFrameHost to add and remove nodes in response to
   // messages from the renderer requesting DOM manipulation.