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..bee7b78c0e59e67bdb9195bca8fe37e77b78dfb7 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;
+  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,12 @@ class CONTENT_EXPORT RenderViewHostImpl
 
   bool CanAccessFilesOfPageState(const PageState& state) const;
 
+  // This is an RenderFrameHost object associated with the top-level frame in
+  // the page rendered by this RenderViewHost.
+  // TODO(nasko): Remove this pointer once we have enough infrastructure to
+  // move this to the top-level FrameTreeNode.
+  scoped_ptr<RenderFrameHostImpl> main_render_frame_host_;
+
   // Our delegate, which wants to know about changes in the RenderView.
   RenderViewHostDelegate* delegate_;