Move ownership of CrossProcessFrameConnector to RenderFrameProxyHost.

content/browser/frame_host/cross_process_frame_connector.h

Index: content/browser/frame_host/cross_process_frame_connector.h
diff --git a/content/browser/frame_host/cross_process_frame_connector.h b/content/browser/frame_host/cross_process_frame_connector.h
index b3d87a4c4d512a01c6349f296117f479955632fb..d746694c09fbeb1443212dbcbe915ecd95b696c6 100644
--- a/content/browser/frame_host/cross_process_frame_connector.h
+++ b/content/browser/frame_host/cross_process_frame_connector.h
@@ -22,7 +22,7 @@ struct FrameHostMsg_ReclaimCompositorResources_Params;
 struct GpuHostMsg_AcceleratedSurfaceBuffersSwapped_Params;
 
 namespace content {
-class RenderFrameHostImpl;
+class RenderFrameProxyHost;
 class RenderWidgetHostImpl;
 class RenderWidgetHostViewChildFrame;
 
@@ -31,8 +31,8 @@ class RenderWidgetHostViewChildFrame;
 // of RenderFrameHost.
 //
 // The RenderWidgetHostView of an out-of-process child frame needs to
-// communicate with the swapped out RenderFrameHost representing this frame
-// in the process of the parent frame. For example, assume you have this page:
+// communicate with the RenderFrameProxyHost representing this frame in the
+// process of the parent frame. For example, assume you have this page:
 //
 //   -----------------
 //   | frame 1       |
@@ -43,8 +43,8 @@ class RenderWidgetHostViewChildFrame;
 //
 // If frames 1 and 2 are in process A and B, there are 4 RenderFrameHosts:
 //   A1 - RFH for frame 1 in process A
-//   B1 - Swapped out RFH for frame 1 in process B
-//   A2 - Swapped out RFH for frame 2 in process A
+//   B1 - RFPH for frame 1 in process B
+//   A2 - RFPH for frame 2 in process A
 //   B2 - RFH for frame 2 in process B
 //
 // B2, having a parent frame in a different process, will have a
@@ -57,15 +57,16 @@ class RenderWidgetHostViewChildFrame;
 // (Note: B1 is only mentioned for completeness. It is not needed in this
 // example.)
 //
-// CrossProcessFrameConnector objects are owned by the child frame's
-// RenderFrameHostManager. When a child frame swaps, SetChildFrameView() is
-// called to update to the new view.
+// CrossProcessFrameConnector objects are owned by the RenderFrameProxyHost
+// in the child frame's RenderFrameHostManager corresponding to the parent's

[kenrb, 2014/06/19 14:49:04]

This is a bit hard to follow, probably good to clarify that it is A2 in the
above illustration.

[nasko, 2014/06/19 15:46:41]

Done.

+// SiteInstance. When a child frame swaps, set_view() is called to update to the

[kenrb, 2014/06/19 14:49:04]

Are we still using the term 'swaps'? Maybe 'navigates and is moved to a new
process' or something similar.

[nasko, 2014/06/19 15:46:41]

Done.

+// new view.
 //
 class CrossProcessFrameConnector {
  public:
   // |frame_proxy_in_parent_renderer| corresponds to A2 in the example above.
   explicit CrossProcessFrameConnector(
-      RenderFrameHostImpl* frame_proxy_in_parent_renderer);
+      RenderFrameProxyHost* frame_proxy_in_parent_renderer);
   virtual ~CrossProcessFrameConnector();
 
   bool OnMessageReceived(const IPC::Message &msg);
@@ -73,6 +74,7 @@ class CrossProcessFrameConnector {
   // |view| corresponds to B2's RenderWidgetHostViewChildFrame in the example
   // above.
   void set_view(RenderWidgetHostViewChildFrame* view);
+  RenderWidgetHostViewChildFrame* get_view_for_testing() { return view_; }
 
   void RenderProcessGone();
 
@@ -108,7 +110,7 @@ class CrossProcessFrameConnector {
   // process.
   // TODO(kenrb): The type becomes RenderFrameProxyHost when that class comes

[kenrb, 2014/06/19 14:49:04]

This TODO can go.

[nasko, 2014/06/19 15:46:41]

Done.

   // to exist.
-  RenderFrameHostImpl* frame_proxy_in_parent_renderer_;
+  RenderFrameProxyHost* frame_proxy_in_parent_renderer_;
 
   // The RenderWidgetHostView for the frame. Initially NULL.
   RenderWidgetHostViewChildFrame* view_;