PlzNavigate: Move the navigation logic to NavigatorImpl

content/browser/frame_host/navigator_impl.h

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CONTENT_BROWSER_FRAME_HOST_NAVIGATOR_IMPL_H_
 #define CONTENT_BROWSER_FRAME_HOST_NAVIGATOR_IMPL_H_
 
+#include "base/containers/scoped_ptr_hash_map.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/time/time.h"
 #include "base/tuple.h"
 #include "content/browser/frame_host/navigation_controller_impl.h"
 #include "content/browser/frame_host/navigator.h"
 #include "content/common/content_export.h"
 #include "url/gurl.h"
 
 class GURL;
 struct FrameMsg_Navigate_Params;
 
 namespace content {
 
 class NavigationControllerImpl;
 class NavigatorDelegate;
+class NavigatorTest;
 struct LoadCommittedDetails;
 struct CommitNavigationParams;
 struct CommonNavigationParams;
 struct RequestNavigationParams;
 
 // This class is an implementation of Navigator, responsible for managing
 // navigations in regular browser tabs.
 class CONTENT_EXPORT NavigatorImpl : public Navigator {
  public:
   NavigatorImpl(NavigationControllerImpl* navigation_controller,
@@ skipping 29 matching lines @@
   virtual void RequestTransferURL(
       RenderFrameHostImpl* render_frame_host,
       const GURL& url,
       const std::vector<GURL>& redirect_chain,
       const Referrer& referrer,
       ui::PageTransition page_transition,
       WindowOpenDisposition disposition,
       const GlobalRequestID& transferred_global_request_id,
       bool should_replace_current_entry,
       bool user_gesture) OVERRIDE;
+  virtual void OnBeginNavigation(
+      FrameTreeNode* frame_tree_node,
+      const FrameHostMsg_BeginNavigation_Params& params,
+      const CommonNavigationParams& common_params) OVERRIDE;
   virtual void CommitNavigation(
-      RenderFrameHostImpl* render_frame_host,
-      const GURL& stream_url,
-      const CommonNavigationParams& common_params,
-      const CommitNavigationParams& commit_params) OVERRIDE;
+      FrameTreeNode* frame_tree_node,
+      const NavigationBeforeCommitInfo& info) OVERRIDE;
   virtual void LogResourceRequestTime(
       base::TimeTicks timestamp, const GURL& url) OVERRIDE;
+  virtual void CancelNavigation(FrameTreeNode* frame_tree_node) OVERRIDE;
 
  private:
+  friend class NavigatorTest;
   virtual ~NavigatorImpl();
 
   // Navigates to the given entry, which must be the pending entry.  Private
   // because all callers should use NavigateToPendingEntry.
   bool NavigateToEntry(
       RenderFrameHostImpl* render_frame_host,
       const NavigationEntryImpl& entry,
       NavigationController::ReloadType reload_type);
 
   bool ShouldAssignSiteForURL(const GURL& url);
 
   void CheckWebUIRendererDoesNotDisplayNormalURL(
     RenderFrameHostImpl* render_frame_host,
     const GURL& url);
 
+  // PlzNavigate: sends a RequestNavigation IPC to the renderer to ask it to
+  // navigate. If no live renderer is present, then the navigation request will
+  // be sent directly to the ResourceDispatcherHost.
+  bool RequestNavigation(FrameTreeNode* frame_tree_node,
+                         const NavigationEntryImpl& entry,
+                         NavigationController::ReloadType reload_type,
+                         base::TimeTicks navigation_start);
+
   // The NavigationController that will keep track of session history for all
   // RenderFrameHost objects using this NavigatorImpl.
   // TODO(nasko): Move ownership of the NavigationController from
   // WebContentsImpl to this class.
   NavigationControllerImpl* controller_;
 
   // Used to notify the object embedding this Navigator about navigation
   // events. Can be NULL in tests.
   NavigatorDelegate* delegate_;
 
   // The start time and URL for latest navigation request, used for feeding a
   // few histograms under the Navigation group.
   Tuple2<base::TimeTicks, GURL> navigation_start_time_and_url;
 
+  // PlzNavigate: used to track the various ongoing NavigationRequests in the
+  // different FrameTreeNodes, based on the frame_tree_node_id.
+  typedef base::ScopedPtrHashMap<int64, NavigationRequest> NavigationRequestMap;
+  NavigationRequestMap navigation_request_map_;
+
   DISALLOW_COPY_AND_ASSIGN(NavigatorImpl);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_FRAME_HOST_NAVIGATOR_IMPL_H_