Move out DidStartProvisionalLoad from WebContentsImpl into Navigator.

content/browser/frame_host/frame_tree_node.h

Index: content/browser/frame_host/frame_tree_node.h
diff --git a/content/browser/frame_host/frame_tree_node.h b/content/browser/frame_host/frame_tree_node.h
index 63030a610a62b7d40402270fad994e023422093c..0b50a937712235e9b40c2ab2b234e0e42d31989a 100644
--- a/content/browser/frame_host/frame_tree_node.h
+++ b/content/browser/frame_host/frame_tree_node.h
@@ -10,11 +10,15 @@
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
+#include "content/browser/frame_host/navigator.h"
 #include "content/common/content_export.h"
 #include "url/gurl.h"
 
 namespace content {
 
+class NavigationControllerImpl;
+class NavigatorDelegate;
+class Navigator;
 class RenderFrameHostImpl;
 
 // When a page contains iframes, its renderer process maintains a tree structure
@@ -25,7 +29,10 @@ class CONTENT_EXPORT FrameTreeNode {
  public:
   static const int64 kInvalidFrameId;
 
-  FrameTreeNode(int64 frame_id, const std::string& name,
+  FrameTreeNode(NavigationControllerImpl* navigation_controller,
+                NavigatorDelegate* navigator_delegate,
+                int64 frame_id,
+                const std::string& name,
                 scoped_ptr<RenderFrameHostImpl> render_frame_host);
   ~FrameTreeNode();
 
@@ -75,6 +82,11 @@ class CONTENT_EXPORT FrameTreeNode {
     return render_frame_host_;
   }
 
+  Navigator* navigator() {
+    return &navigator_;
+  }
+
+
  private:
   // The unique identifier for the frame in the page.
   int64 frame_id_;
@@ -86,6 +98,10 @@ class CONTENT_EXPORT FrameTreeNode {
   // The immediate children of this specific frame.
   ScopedVector<FrameTreeNode> children_;
 
+  // Used to perform navigation in the RenderFrameHosts associated with this
+  // FrameTreeNode.
+  Navigator navigator_;

[Charlie Reis, 2013/11/07 01:22:43]

From our discussion, let's change this to have the same Navigator object for
every frame, making this a scoped_refptr to keep it alive as long as any
FrameTreeNode is using it.

+
   // When ResetForMainFrame() is called, this is set to false and the
   // |render_frame_host_| below is not deleted on destruction.
   //