Move RenderViewHost swap out state to RenderFrameHost.

content/browser/frame_host/render_frame_proxy_host.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/frame_host/render_frame_proxy_host.h"
 
 #include "base/lazy_instance.h"
 #include "content/browser/frame_host/cross_process_frame_connector.h"
 #include "content/browser/frame_host/frame_tree.h"
 #include "content/browser/frame_host/frame_tree_node.h"
@@ skipping 68 matching lines @@
 void RenderFrameProxyHost::SetChildRWHView(RenderWidgetHostView* view) {
   cross_process_frame_connector_->set_view(
       static_cast<RenderWidgetHostViewChildFrame*>(view));
 }
 
 RenderViewHostImpl* RenderFrameProxyHost::GetRenderViewHost() {
   return frame_tree_node_->frame_tree()->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();
 }
 
 bool RenderFrameProxyHost::Send(IPC::Message *msg) {
   // TODO(nasko): For now, RenderFrameHost uses this object to send IPC messages
   // while swapped out. This can be removed once we don't have a swapped out
   // state on RenderFrameHosts. See https://crbug.com/357747.
   msg->set_routing_id(routing_id_);
@@ skipping 38 matching lines @@
                                       ->GetRoutingID()));
 
   return true;
 }
 
 void RenderFrameProxyHost::DisownOpener() {
   Send(new FrameMsg_DisownOpener(GetRoutingID()));
 }
 
 }  // namespace content