[DRAFT] Create RenderFrameHostManager.

content/browser/frame_host/frame_tree.h

Index: content/browser/frame_host/frame_tree.h
diff --git a/content/browser/frame_host/frame_tree.h b/content/browser/frame_host/frame_tree.h
index 2ee1cdd7552f63c6c95a5c051bc62a60d0fe3f62..871d2de77dd4ebe849d44cada9411a6ca843028a 100644
--- a/content/browser/frame_host/frame_tree.h
+++ b/content/browser/frame_host/frame_tree.h
@@ -34,9 +34,6 @@ class RenderWidgetHostDelegate;
 // TODO(ajwong): Move NavigationController ownership to the main frame
 // FrameTreeNode. Possibly expose access to it from here.
 //
-// TODO(ajwong): Currently this class only contains FrameTreeNodes for
-// subframes if the --site-per-process flag is enabled.
-//
 // This object is only used on the UI thread.
 class CONTENT_EXPORT FrameTree {
  public:
@@ -63,27 +60,19 @@ class CONTENT_EXPORT FrameTree {
   // if |on_node| is just doing a search over the tree.
   void ForEach(const base::Callback<bool(FrameTreeNode*)>& on_node) const;
 
-  // After the FrameTree is created, or after SwapMainFrame() has been called,
-  // the root node does not yet have a frame id. This is allocated by the
-  // renderer and is published to the browser process on the first navigation
-  // after a swap. These two functions are used to set the root node's frame
-  // id.
-  //
-  // TODO(ajwong): Remove these once RenderFrameHost's routing id replaces
-  // frame_id.
-  bool IsFirstNavigationAfterSwap() const;
-  void OnFirstNavigationAfterSwap(int main_frame_id);
-
   // Frame tree manipulation routines.
   // TODO(creis): These should take in RenderFrameHost routing IDs.
-  RenderFrameHostImpl* AddFrame(int frame_routing_id,
-                                int64 parent_frame_tree_node_id,
+  RenderFrameHostImpl* AddFrame(RenderViewHostImpl* parent_render_view_host,
+                                int frame_routing_id,
+                                int64 parent_frame_id,
                                 int64 frame_id,
                                 const std::string& frame_name);
+  // TODO(creis): Remove |frame_id|.
   void RemoveFrame(RenderFrameHostImpl* render_frame_host,
-                   int64 parent_frame_id,
+                   int64 parent_frame_tree_node_id,
+                   int64 frame_tree_node_id,
                    int64 frame_id);
-  void SetFrameUrl(int64 frame_id, const GURL& url);
+  void SetFrameUrl(int64 frame_tree_node_id, const GURL& url);
 
   // Clears process specific-state after a main frame process swap.
   // This destroys most of the frame tree but retains the root node so that