Revert of 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 e321d3a51b9923656f747c969bed0dd38ba12f7f..30843d8f2723c8663f30370e980322f67fa3724d 100644
--- a/content/browser/frame_host/frame_tree_node.h
+++ b/content/browser/frame_host/frame_tree_node.h
@@ -21,7 +21,6 @@
 namespace content {
 
 class FrameTree;
-class NavigationRequest;
 class Navigator;
 class RenderFrameHostImpl;
 
@@ -143,20 +142,6 @@
   // 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
-  // Resets the current navigation request. |is_commit| is true if the reset is
-  // due to the commit of the navigation.
-  void ResetNavigationRequest(bool is_commit);
-
  private:
   void set_parent(FrameTreeNode* parent) { parent_ = parent; }
 
@@ -210,11 +195,6 @@
   // 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 a RenderFrameHost will be responsible for the navigation.
-  scoped_ptr<NavigationRequest> navigation_request_;
-
   DISALLOW_COPY_AND_ASSIGN(FrameTreeNode);
 };