PlzNavigate: implement CommitNavigation on the browser side

content/browser/frame_host/navigator_impl.h

Index: content/browser/frame_host/navigator_impl.h
diff --git a/content/browser/frame_host/navigator_impl.h b/content/browser/frame_host/navigator_impl.h
index 42262935862a757b5bc3cb0b6bef3ae989c75d8d..2bb26227ad46e94ffdd7f82405124f1074389fe6 100644
--- a/content/browser/frame_host/navigator_impl.h
+++ b/content/browser/frame_host/navigator_impl.h
@@ -6,10 +6,12 @@
 #define CONTENT_BROWSER_FRAME_HOST_NAVIGATOR_IMPL_H_
 
 #include "base/memory/ref_counted.h"
+#include "base/memory/scoped_ptr.h"
 #include "content/browser/frame_host/navigation_controller_impl.h"
 #include "content/browser/frame_host/navigator.h"
 #include "content/common/content_export.h"
 
+class GURL;
 struct FrameMsg_Navigate_Params;
 
 namespace content {
@@ -17,6 +19,9 @@ namespace content {
 class NavigationControllerImpl;
 class NavigatorDelegate;
 struct LoadCommittedDetails;
+struct CommitNavigationParams;
+struct CoreNavigationParams;
+struct RequestNavigationParams;
 
 // This class is an implementation of Navigator, responsible for managing
 // navigations in regular browser tabs.
@@ -25,13 +30,6 @@ class CONTENT_EXPORT NavigatorImpl : public Navigator {
   NavigatorImpl(NavigationControllerImpl* navigation_controller,
                 NavigatorDelegate* delegate);
 
-  // Fills in |params| based on the content of |entry|.
-  static void MakeNavigateParams(const NavigationEntryImpl& entry,
-                                 const NavigationControllerImpl& controller,
-                                 NavigationController::ReloadType reload_type,
-                                 base::TimeTicks navigation_start,
-                                 FrameMsg_Navigate_Params* params);
-
   // Navigator implementation.
   virtual NavigationController* GetController() OVERRIDE;
   virtual void DidStartProvisionalLoad(RenderFrameHostImpl* render_frame_host,
@@ -76,8 +74,17 @@ class CONTENT_EXPORT NavigatorImpl : public Navigator {
       bool user_gesture) OVERRIDE;
   virtual void CommitNavigation(
       RenderFrameHostImpl* render_frame_host,
-      const NavigationBeforeCommitInfo& info) OVERRIDE;
+      const GURL& stream_url,
+      const CoreNavigationParams& core_params,
+      const CommitNavigationParams& commit_params) OVERRIDE;
 
+  // PlzNavigate
+  void MakeNavigationParamsForTest(
+      const NavigationEntryImpl& entry,
+      NavigationController::ReloadType reload_type,
+      CoreNavigationParams* core_params,
+      RequestNavigationParams* request_params,
+      CommitNavigationParams* commit_params);
  private:
   virtual ~NavigatorImpl() {}