Move ownership of CrossProcessFrameConnector to RenderFrameProxyHost.

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 b09fccb5eab3cf49306a090122c953ceca60713c..124601ab951703b4c446b21b8d0f3bdb07c09d13 100644
--- a/content/browser/frame_host/render_frame_proxy_host.cc
+++ b/content/browser/frame_host/render_frame_proxy_host.cc
@@ -4,12 +4,18 @@
 
 #include "content/browser/frame_host/render_frame_proxy_host.h"
 
+#include "content/browser/frame_host/cross_process_frame_connector.h"
 #include "content/browser/frame_host/frame_tree_node.h"
 #include "content/browser/frame_host/render_frame_host_impl.h"
+#include "content/browser/frame_host/render_widget_host_view_child_frame.h"
+#include "content/browser/renderer_host/render_widget_host_view_base.h"
 #include "content/browser/site_instance_impl.h"
 #include "content/common/frame_messages.h"
 #include "ipc/ipc_message.h"
 
+#include "ipc/ipc_logging.h"
+#include "ipc/ipc_message_utils.h"
+
 namespace content {
 
 RenderFrameProxyHost::RenderFrameProxyHost(SiteInstance* site_instance,
@@ -18,6 +24,27 @@ RenderFrameProxyHost::RenderFrameProxyHost(SiteInstance* site_instance,
       site_instance_(site_instance),
       frame_tree_node_(frame_tree_node) {
   GetProcess()->AddRoute(routing_id_, this);
+  LOG(ERROR) << "RFPH::RFPH[" << this << "]:"
+    << " routing_id:" << routing_id_ << ", site:" << site_instance->GetSiteURL();
+
+  if (!frame_tree_node_->IsMainFrame() &&
+      frame_tree_node_->parent()->render_manager()->current_frame_host()->GetSiteInstance() ==
+      site_instance) {
+    // The RenderFrameHost being swapped out becomes the proxy for this
+    // frame in its parent's process. CrossProcessFrameConnector
+    // initialization only needs to happen on an initial cross-process
+    // navigation, when the RenderFrame leaves the same process as its parent.
+    // The same CrossProcessFrameConnector is used for subsequent cross-
+    // process navigations, but it will be destroyed if the Frame is
+    // navigated back to the same site instance as its parent.
+    // TODO(kenrb): This will change when RenderFrameProxyHost is created.
+    // TODO(nasko): Move CrossProcessFrameConnector to be owned by
+    // RenderFrameProxyHost instead of RenderFrameHostManager once proxy
+    // support lands.
+    cross_process_frame_connector_.reset(new CrossProcessFrameConnector(this));
+    LOG(ERROR) << "RFPH::RFPH[" << this << "]:"
+        " created CPFC:" << cross_process_frame_connector_.get();
+  }
 }
 
 RenderFrameProxyHost::~RenderFrameProxyHost() {
@@ -27,6 +54,14 @@ RenderFrameProxyHost::~RenderFrameProxyHost() {
   GetProcess()->RemoveRoute(routing_id_);
 }
 
+void RenderFrameProxyHost::SetView(RenderWidgetHostView* view) {
+  LOG(ERROR) << "RFPH::SetView[" << this << "]:"
+    << " CPFC:" << cross_process_frame_connector_.get()
+    << " view:" << view;
+  cross_process_frame_connector_->set_view(
+      static_cast<RenderWidgetHostViewChildFrame*>(view));
+}
+
 RenderViewHostImpl* RenderFrameProxyHost::GetRenderViewHost() {
   if (render_frame_host_.get())
     return render_frame_host_->render_view_host();
@@ -47,6 +82,15 @@ bool RenderFrameProxyHost::Send(IPC::Message *msg) {
 }
 
 bool RenderFrameProxyHost::OnMessageReceived(const IPC::Message& msg) {
+
+  IPC::LogData data;
+  IPC::GenerateLogData("", msg, &data, true);
+  LOG(ERROR) << "RFPH::OnMessageReceived: [" << this << "]: " << data.message_name;
+
+  if (cross_process_frame_connector_.get() &&
+      cross_process_frame_connector_->OnMessageReceived(msg))
+    return true;
+
   // TODO(nasko): This can be removed once we don't have a swapped out state on
   // RenderFrameHosts. See https://crbug.com/357747.
   if (render_frame_host_.get())