Create a new RenderFrameHost per child frame when --site-per-process is enabled.

content/browser/web_contents/web_contents_impl.h

Index: content/browser/web_contents/web_contents_impl.h
diff --git a/content/browser/web_contents/web_contents_impl.h b/content/browser/web_contents/web_contents_impl.h
index b96e9b5ea6cfe5217691e154a0be3cc0f0b6ca57..9a838e2f1340df70586baa2c3f136a968d8aa44b 100644
--- a/content/browser/web_contents/web_contents_impl.h
+++ b/content/browser/web_contents/web_contents_impl.h
@@ -15,9 +15,9 @@
 #include "base/observer_list.h"
 #include "base/process/process.h"
 #include "base/values.h"
+#include "content/browser/renderer_host/frame_tree.h"
 #include "content/browser/renderer_host/render_view_host_delegate.h"
 #include "content/browser/renderer_host/render_widget_host_delegate.h"
-#include "content/browser/web_contents/frame_tree_node.h"
 #include "content/browser/web_contents/navigation_controller_impl.h"
 #include "content/browser/web_contents/render_view_host_manager.h"
 #include "content/common/content_export.h"
@@ -203,10 +203,6 @@ class CONTENT_EXPORT WebContentsImpl
   void DragSourceMovedTo(int client_x, int client_y,
                          int screen_x, int screen_y);
 
-  FrameTreeNode* GetFrameTreeRootForTesting() {
-    return frame_tree_root_.get();
-  }
-
   // WebContents ------------------------------------------------------
   virtual WebContentsDelegate* GetDelegate() OVERRIDE;
   virtual void SetDelegate(WebContentsDelegate* delegate) OVERRIDE;
@@ -466,6 +462,7 @@ class CONTENT_EXPORT WebContentsImpl
       const MediaResponseCallback& callback) OVERRIDE;
   virtual SessionStorageNamespace* GetSessionStorageNamespace(
       SiteInstance* instance) OVERRIDE;
+  virtual FrameTree* GetFrameTree() OVERRIDE;
 
   // RenderWidgetHostDelegate --------------------------------------------------
 
@@ -636,10 +633,6 @@ class CONTENT_EXPORT WebContentsImpl
                           const std::vector<SkBitmap>& bitmaps);
   void OnUpdateFaviconURL(int32 page_id,
                           const std::vector<FaviconURL>& candidates);
-  void OnFrameAttached(int64 parent_frame_id,
-                       int64 frame_id,
-                       const std::string& frame_name);
-  void OnFrameDetached(int64 parent_frame_id, int64 frame_id);
 
   void OnMediaNotification(int64 player_cookie,
                            bool has_video,
@@ -752,8 +745,6 @@ class CONTENT_EXPORT WebContentsImpl
 
   RenderViewHostImpl* GetRenderViewHostImpl();
 
-  FrameTreeNode* FindFrameTreeNodeByID(int64 frame_id);
-
   // Removes browser plugin embedder if there is one.
   void RemoveBrowserPluginEmbedder();
 
@@ -766,6 +757,8 @@ class CONTENT_EXPORT WebContentsImpl
   // Helper function to invoke WebContentsDelegate::GetSizeForNewRenderView().
   gfx::Size GetSizeForNewRenderView() const;
 
+  void OnFrameRemoved(int64 frame_id);
+
   // Data for core operation ---------------------------------------------------
 
   // Delegate for notifying our owner about stuff. Not owned by us.
@@ -821,6 +814,10 @@ class CONTENT_EXPORT WebContentsImpl
   // Manages creation and swapping of render views.
   RenderViewHostManager render_manager_;
 
+  // The frame tree structure of the current page. Must be destroyed before the
+  // RenderViewHostManager.

[Charlie Reis, 2013/09/11 22:25:04]

Would help to explain why, since I imagine that will change when we move RVHM to
be an RFHM within a FrameTreeNode.

[awong, 2013/09/21 01:19:56]

Done.

+  FrameTree frame_tree_;
+
 #if defined(OS_ANDROID)
   // Manages injecting Java objects into all RenderViewHosts associated with
   // this WebContentsImpl.
@@ -876,9 +873,6 @@ class CONTENT_EXPORT WebContentsImpl
   // True if this is a secure page which displayed insecure content.
   bool displayed_insecure_content_;
 
-  // The frame tree structure of the current page.
-  scoped_ptr<FrameTreeNode> frame_tree_root_;
-
   // Data for misc internal state ----------------------------------------------
 
   // When > 0, the WebContents is currently being captured (e.g., for