Move RenderViewHost swap out state to RenderFrameHost.

content/browser/frame_host/render_frame_proxy_host.cc

Index: content/browser/frame_host/render_frame_proxy_host.cc
diff --git a/content/browser/frame_host/render_frame_proxy_host.cc b/content/browser/frame_host/render_frame_proxy_host.cc
index 35ed28639884b1216268a3f5b84f3171f1a7eb8f..1e99ff76eac1c83ccae036c7e6c92a72c2add875 100644
--- a/content/browser/frame_host/render_frame_proxy_host.cc
+++ b/content/browser/frame_host/render_frame_proxy_host.cc
@@ -86,6 +86,12 @@ RenderViewHostImpl* RenderFrameProxyHost::GetRenderViewHost() {
       site_instance_.get());
 }
 
+void RenderFrameProxyHost::TakeFrameHostOwnership(
+    scoped_ptr<RenderFrameHostImpl> render_frame_host) {
+  render_frame_host_ = render_frame_host.Pass();
+  render_frame_host_->set_render_frame_proxy_host(this);

[Charlie Reis, 2014/09/29 16:52:57]

The proxy host wasn't getting set on main frames that were created in the
swapped out state, so I added this call here to match the PassOwnership case.

[nasko, 2014/09/29 20:28:09]

Thanks!

+}
+
 scoped_ptr<RenderFrameHostImpl> RenderFrameProxyHost::PassFrameHostOwnership() {
   render_frame_host_->set_render_frame_proxy_host(NULL);
   return render_frame_host_.Pass();