PlzNavigate: Move the navigation logic to NavigatorImpl

content/browser/frame_host/navigator.h

Index: content/browser/frame_host/navigator.h
diff --git a/content/browser/frame_host/navigator.h b/content/browser/frame_host/navigator.h
index 6e49dc3cb161c6ae91a9818faa701d398e2b3243..b05b538a2114c1a47ba7a31046d6ce8a424dd1f5 100644
--- a/content/browser/frame_host/navigator.h
+++ b/content/browser/frame_host/navigator.h
@@ -22,12 +22,14 @@ class TimeTicks;
 
 namespace content {
 
+class FrameTreeNode;
 class NavigationControllerImpl;
 class NavigationEntryImpl;
+class NavigationRequest;
 class NavigatorDelegate;
 class RenderFrameHostImpl;
-struct CommitNavigationParams;
 struct CommonNavigationParams;
+struct NavigationBeforeCommitInfo;
 
 // Implementations of this interface are responsible for performing navigations
 // in a node of the FrameTree. Its lifetime is bound to all FrameTreeNode
@@ -111,13 +113,26 @@ class CONTENT_EXPORT Navigator : public base::RefCounted<Navigator> {
       bool should_replace_current_entry,
       bool user_gesture) {}
 
+  // PlzNavigate: Used to start a navigation. OnBeginNavigation is called
+  // directly by RequestNavigation when there is no live renderer. Otherwise, it
+  // is called following a BeginNavigation IPC from the renderer (which in
+  // browser-initiated navigation also happens after RequestNavigation has been
+  // called).
+  virtual void OnBeginNavigation(
+      FrameTreeNode* frame_tree_node,
+      const FrameHostMsg_BeginNavigation_Params& params,
+      const CommonNavigationParams& common_params) {}
+
   // PlzNavigate
   // Signal |render_frame_host| that a navigation is ready to commit (the
   // response to the navigation request has been received).
-  virtual void CommitNavigation(RenderFrameHostImpl* render_frame_host,
-                                const GURL& stream_url,
-                                const CommonNavigationParams& common_params,
-                                const CommitNavigationParams& commit_params) {}
+  virtual void CommitNavigation(FrameTreeNode* frame_tree_node,
+                                const NavigationBeforeCommitInfo& info) {}
+
+  // PlzNavigate
+  // Cancel a NavigationRequest for |frame_tree_node|. Called when
+  // |frame_tree_node| is destroyed.
+  virtual void CancelNavigation(FrameTreeNode* frame_tree_node) {}
 
   // Called when the first resource request for a given navigation is executed
   // so that it can be tracked into an histogram.