PlzNavigate: move ownership of the NavigationRequest to the FrameTreeNode

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 30843d8f2723c8663f30370e980322f67fa3724d..41c802ff0b7b48df4128a3621497a65a31275ba5 100644
--- a/content/browser/frame_host/frame_tree_node.h
+++ b/content/browser/frame_host/frame_tree_node.h
@@ -21,6 +21,7 @@
 namespace content {
 
 class FrameTree;
+class NavigationRequest;
 class Navigator;
 class RenderFrameHostImpl;
 
@@ -142,6 +143,20 @@ class CONTENT_EXPORT FrameTreeNode {
   // Returns this node's loading progress.
   double loading_progress() const { return loading_progress_; }
 
+  NavigationRequest* navigation_request() { return navigation_request_.get(); }
+
+  // PlzNavigate
+  // Takes ownership of |navigation_request| and makes it the current
+  // NavigationRequest of this frame. This corresponds to the start of a new
+  // navigation. If there was an ongoing navigation request before calling this
+  // function, it is canceled. |navigation_request| should not be null.
+  void SetNavigationRequest(scoped_ptr<NavigationRequest> navigation_request);
+
+  // PlzNavigate
+  // Reset the current navigation request. |is_commit| is true if the reset is

[Fabrice (no longer in Chrome), 2015/04/16 14:01:27]

nit: s/Reset/Resets/

[clamy, 2015/04/16 16:14:05]

Done.

+  // due to the commit of the navigation.
+  void ResetNavigationRequest(bool is_commit);
+
  private:
   void set_parent(FrameTreeNode* parent) { parent_ = parent; }
 
@@ -195,6 +210,11 @@ class CONTENT_EXPORT FrameTreeNode {
   // Used to track this node's loading progress (from 0 to 1).
   double loading_progress_;
 
+  // PlzNavigate
+  // Owns an ongoing NavigationRequest until it is ready to commit. It will then
+  // be reset and the navigation will be owned by a RenderFrameHost.

[nasko, 2015/04/16 16:02:34]

nit: s/navigation/NavigationRequest/. A navigation on its own isn't an object
that anyone owns.

[clamy, 2015/04/16 16:14:05]

I've rephrased it. We cannot use NavigationRequest here, since the
NavigationRequest is destroyed at commit time, and so it is never owned by a
RFH.

+  scoped_ptr<NavigationRequest> navigation_request_;
+
   DISALLOW_COPY_AND_ASSIGN(FrameTreeNode);
 };