PlzNavigate: implement CommitNavigation on the browser side

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/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"
 
 struct FrameMsg_Navigate_Params;
 
 namespace content {
 
 class NavigationControllerImpl;
 class NavigatorDelegate;
 struct LoadCommittedDetails;
+struct NavigationParamsWithRequestAndCommitInfo;
 
 // 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,
                 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,
                                        const GURL& url,
                                        bool is_transition_navigation) OVERRIDE;
   virtual void DidFailProvisionalLoadWithError(
       RenderFrameHostImpl* render_frame_host,
       const FrameHostMsg_DidFailProvisionalLoadWithError_Params& params)
       OVERRIDE;
   virtual void DidFailLoadWithError(
@@ skipping 25 matching lines @@
       const GURL& url,
       const std::vector<GURL>& redirect_chain,
       const Referrer& referrer,
       PageTransition page_transition,
       WindowOpenDisposition disposition,
       const GlobalRequestID& transferred_global_request_id,
       bool should_replace_current_entry,
       bool user_gesture) OVERRIDE;
   virtual void CommitNavigation(
       RenderFrameHostImpl* render_frame_host,
-      const NavigationBeforeCommitInfo& info) OVERRIDE;
+      const FrameMsg_CommitNavigation_Params& commit_navigation_params)
+      OVERRIDE;
 
+  // PlzNavigate
+  scoped_ptr<NavigationParamsWithRequestAndCommitInfo>
+  MakeNavigationParamsForTest(
+      const NavigationEntryImpl& entry,
+      NavigationController::ReloadType reload_type);
  private:
   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);
 
@@ skipping 15 matching lines @@
 
   // System time at which the current load was started.
   base::TimeTicks current_load_start_;
 
   DISALLOW_COPY_AND_ASSIGN(NavigatorImpl);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_FRAME_HOST_NAVIGATOR_IMPL_H_