DRAFT CL: Add FrameNavigationEntry and track subframe session histories.

content/browser/frame_host/render_frame_host_manager.cc

Index: content/browser/frame_host/render_frame_host_manager.cc
diff --git a/content/browser/frame_host/render_frame_host_manager.cc b/content/browser/frame_host/render_frame_host_manager.cc
index 3344f3dab66dccb585fde4aa1d2720e9838b5bc5..4141acef3b5ac528cac32a2a80da9a5228e12db3 100644
--- a/content/browser/frame_host/render_frame_host_manager.cc
+++ b/content/browser/frame_host/render_frame_host_manager.cc
@@ -14,6 +14,7 @@
 #include "content/browser/devtools/render_frame_devtools_agent_host.h"
 #include "content/browser/frame_host/cross_site_transferring_request.h"
 #include "content/browser/frame_host/debug_urls.h"
+#include "content/browser/frame_host/frame_navigation_entry.h"
 #include "content/browser/frame_host/interstitial_page_impl.h"
 #include "content/browser/frame_host/navigation_controller_impl.h"
 #include "content/browser/frame_host/navigation_entry_impl.h"
@@ -183,12 +184,16 @@ scoped_ptr<WebUIImpl> RenderFrameHostManager::CreateWebUI(const GURL& url,
 }
 
 RenderFrameHostImpl* RenderFrameHostManager::Navigate(
+    const FrameNavigationEntry& frame_entry,
     const NavigationEntryImpl& entry) {
   TRACE_EVENT1("navigation", "RenderFrameHostManager:Navigate",
                "FrameTreeNode id", frame_tree_node_->frame_tree_node_id());
   // Create a pending RenderFrameHost to use for the navigation.
   RenderFrameHostImpl* dest_render_frame_host = UpdateStateForNavigate(
-      entry.GetURL(), entry.source_site_instance(), entry.site_instance(),
+      frame_entry.url(),
+      // TODO(creis): Move source_site_instance to FNE.
+      entry.source_site_instance(),
+      frame_entry.site_instance(),
       entry.GetTransitionType(),
       entry.restore_type() != NavigationEntryImpl::RESTORE_NONE,
       entry.IsViewSourceMode(), entry.transferred_global_request_id(),
@@ -259,6 +264,11 @@ RenderFrameHostImpl* RenderFrameHostManager::Navigate(
   return dest_render_frame_host;
 }
 
+RenderFrameHostImpl* RenderFrameHostManager::NavigateMainFrame(
+    const NavigationEntryImpl& entry) {
+  return Navigate(*entry.root_node()->frame_entry, entry);
+}
+
 void RenderFrameHostManager::Stop() {
   render_frame_host_->Stop();