Remove the FrameMsg_Navigate_Params

content/renderer/render_view_impl.h

 // Copyright (c) 2012 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_RENDERER_RENDER_VIEW_IMPL_H_
 #define CONTENT_RENDERER_RENDER_VIEW_IMPL_H_
 
 #include <deque>
 #include <map>
 #include <set>
@@ skipping 822 matching lines @@
 
   // Whether we must stop creating nested message loops for modal dialogs until
   // OnSwapOut is called.  This is necessary because modal dialogs have a
   // PageGroupLoadDeferrer on the stack that interferes with swapping out.
   bool suppress_dialogs_until_swap_out_;
 
   // Holds state pertaining to a navigation that we initiated.  This is held by
   // the WebDataSource::ExtraData attribute.  We use pending_navigation_state_
   // as a temporary holder for the state until the WebDataSource corresponding
   // to the new navigation is created.  See DidCreateDataSource.
+  // PlzNavigate: |pending_start_params_| is not used.
   // TODO(nasko): Move to RenderFrame, as this is per-frame state.
-  scoped_ptr<FrameMsg_Navigate_Params> pending_navigation_params_;
+  scoped_ptr<CommonNavigationParams> pending_common_params_;

[clamy, 2015/03/09 14:34:47]

Unlike in RenderFrameHostImpl, I did not bundle these parameters together in a
struct, as the StartNavigationParameters is not used in PlzNavigate. Now I could
also define the struct in navigation_params.h and use it both in
RenderFrameHostImpl and here (with a default value for the StartNavigationParams
in PlzNavigate).

[nasko, 2015/03/09 23:24:23]

Unifying those together will be nice, as we don't have a chance of having
different lifetimes.

[clamy, 2015/03/10 16:45:44]

Done.

+  scoped_ptr<StartNavigationParams> pending_start_params_;
+  scoped_ptr<CommitNavigationParams> pending_commit_params_;
+  scoped_ptr<HistoryNavigationParams> pending_history_params_;
 
   // Timer used to delay the updating of nav state (see SyncNavigationState).
   base::OneShotTimer<RenderViewImpl> nav_state_sync_timer_;
 
   // Page IDs ------------------------------------------------------------------
   // See documentation in RenderView.
   int32 page_id_;
 
   // The next available page ID to use for this RenderView.  These IDs are
   // specific to a given RenderView and the frames within it.
@@ skipping 190 matching lines @@
   // use the Observer interface to filter IPC messages and receive frame change
   // notifications.
   // ---------------------------------------------------------------------------
 
   DISALLOW_COPY_AND_ASSIGN(RenderViewImpl);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_RENDER_VIEW_IMPL_H_