Decouple RVH creation from CrossProcessFrameConnector.

content/browser/frame_host/render_frame_host_manager.h

Index: content/browser/frame_host/render_frame_host_manager.h
diff --git a/content/browser/frame_host/render_frame_host_manager.h b/content/browser/frame_host/render_frame_host_manager.h
index 598dbd415f159650f479814b86f0e15640a34440..a89e476dfb7a670cacc506d08dc5bf7d0f01c6a1 100644
--- a/content/browser/frame_host/render_frame_host_manager.h
+++ b/content/browser/frame_host/render_frame_host_manager.h
@@ -57,14 +57,16 @@ class CONTENT_EXPORT RenderFrameHostManager : public NotificationObserver {
     // corresponding to this view host. If this method is not called and the
     // process is not shared, then the WebContentsImpl will act as though the
     // renderer is not running (i.e., it will render "sad tab"). This method is
-    // automatically called from LoadURL.
+    // automatically called from LoadURL. |main_frame| indicates whether this

[Charlie Reis, 2014/05/16 17:04:06]

This comment doesn't quite make sense, because a RenderViewHost can be used for
both a main frame and a subframe during its lifetime.  I think we want to say it
indicates whether |render_view_host| is being created for a main frame.

[nasko, 2014/05/16 17:26:02]

At this point in time, I don't think RVH can be reused for both main frame and
subframes. We need to tackle this, but I'm guessing it will come as we make
RenderWidgetHost be owned by RFH and no longer needing the RVH for the widget
part of it.

+    // RenderViewHost is used to render a top-level frame or subframe, so the

[Charlie Reis, 2014/05/16 17:04:06]

nit: drop "or subframe"

[nasko, 2014/05/16 17:26:02]

Done.

+    // appropriate RenderWidgetHostView type is used.
     //
     // If you are attaching to an already-existing RenderView, you should call
     // InitWithExistingID.
     virtual bool CreateRenderViewForRenderManager(
         RenderViewHost* render_view_host,
         int opener_route_id,
-        CrossProcessFrameConnector* cross_process_frame_connector) = 0;
+        bool main_frame) = 0;

[Charlie Reis, 2014/05/16 17:04:06]

nit: for_main_frame
(for the same reason mentioned above)

[nasko, 2014/05/16 17:26:02]

Done.

     virtual void BeforeUnloadFiredFromRenderManager(
         bool proceed, const base::TimeTicks& proceed_time,
         bool* proceed_to_fire_unload) = 0;
@@ -377,7 +379,9 @@ class CONTENT_EXPORT RenderFrameHostManager : public NotificationObserver {
   // initialized for another RenderFrameHost.
   // TODO(creis): opener_route_id is currently for the RenderViewHost but should
   // be for the RenderFrame, since frames can have openers.
-  bool InitRenderView(RenderViewHost* render_view_host, int opener_route_id);
+  bool InitRenderView(RenderViewHost* render_view_host,
+                      int opener_route_id,
+                      bool main_frame);

[Charlie Reis, 2014/05/16 17:04:06]

nit: for_main_frame

[nasko, 2014/05/16 17:26:02]

Done.

 
   // Sets the pending RenderFrameHost/WebUI to be the active one. Note that this
   // doesn't require the pending render_frame_host_ pointer to be non-NULL,