Create RenderFrame/RenderFrameHost for the main frame of a page.

content/browser/renderer_host/render_view_host_impl.h

Index: content/browser/renderer_host/render_view_host_impl.h
diff --git a/content/browser/renderer_host/render_view_host_impl.h b/content/browser/renderer_host/render_view_host_impl.h
index 2d5249f6c2d7dc3ac9a9b176f2b9deb2ee3f1b64..344b285817bbaa76a36c1923f5722ed0f2a96bc3 100644
--- a/content/browser/renderer_host/render_view_host_impl.h
+++ b/content/browser/renderer_host/render_view_host_impl.h
@@ -14,6 +14,7 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/observer_list.h"
 #include "base/process_util.h"
+#include "content/browser/renderer_host/render_frame_host_impl.h"
 #include "content/browser/renderer_host/render_widget_host_impl.h"
 #include "content/browser/site_instance_impl.h"
 #include "content/common/accessibility_node_data.h"
@@ -62,6 +63,7 @@ namespace content {
 class ChildProcessSecurityPolicyImpl;
 class PageState;
 class PowerSaveBlocker;
+class RenderFrameHostImpl;
 class RenderViewHostObserver;
 class RenderWidgetHostDelegate;
 class SessionStorageNamespace;
@@ -120,6 +122,7 @@ class CONTENT_EXPORT RenderViewHostImpl
       RenderViewHostDelegate* delegate,
       RenderWidgetHostDelegate* widget_delegate,
       int routing_id,
+      int main_frame_routing_id,
       bool swapped_out,
       SessionStorageNamespace* session_storage_namespace);
   virtual ~RenderViewHostImpl();
@@ -364,6 +367,7 @@ class CONTENT_EXPORT RenderViewHostImpl
   // Creates a new RenderView with the given route id.
   void CreateNewWindow(
       int route_id,
+      int main_frame_route_id,
       const ViewHostMsg_CreateWindow_Params& params,
       SessionStorageNamespace* session_storage_namespace);
 
@@ -567,6 +571,7 @@ class CONTENT_EXPORT RenderViewHostImpl
 
  private:
   friend class TestRenderViewHost;

[Charlie Reis, 2013/05/30 00:41:53]

Ah, in this case, we have a TestRenderViewHost friend.  Probably better to
expose RenderFrameHost from it than to also include the FRIEND_TEST_ALL_PREFIXES
macro.

[nasko, 2013/05/30 17:07:03]

TestRenderViewHost is used only in unit tests, isn't it? I've added this test to
the browser test, since I want to test the full roundtrip of window.open().

[Charlie Reis, 2013/05/30 18:26:59]

Good point!  Guess we do need it.

[nasko, 2013/05/30 19:03:48]

Done.

+  FRIEND_TEST_ALL_PREFIXES(RenderViewHostTest, BasicRenderFrameHost);
 
   // Sets whether this RenderViewHost is swapped out in favor of another,
   // and clears any waiting state that is no longer relevant.
@@ -576,6 +581,8 @@ class CONTENT_EXPORT RenderViewHostImpl
 
   bool CanAccessFilesOfPageState(const PageState& state) const;
 
+  scoped_ptr<RenderFrameHostImpl> main_render_frame_host_;

[Charlie Reis, 2013/05/30 00:41:53]

This needs a comment.

[nasko, 2013/05/30 17:07:03]

Done.

+
   // Our delegate, which wants to know about changes in the RenderView.
   RenderViewHostDelegate* delegate_;
 
@@ -624,6 +631,8 @@ class CONTENT_EXPORT RenderViewHostImpl
   // terminated (in RenderViewGone).
   int64 main_frame_id_;
 
+  int main_frame_routing_id_;

[Charlie Reis, 2013/05/30 00:41:53]

Why would we store this, rather than asking main_render_frame_host_?

[nasko, 2013/05/30 17:07:03]

I added it in previous iterations and it looks redundant now.

+
   // If we were asked to RunModal, then this will hold the reply_msg that we
   // must return to the renderer to unblock it.
   IPC::Message* run_modal_reply_msg_;