Make NavigationParams clearer

content/renderer/render_frame_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_RENDERER_RENDER_FRAME_IMPL_H_
 #define CONTENT_RENDERER_RENDER_FRAME_IMPL_H_
 
 #include <vector>
 
 #include "base/basictypes.h"
@@ skipping 80 matching lines @@
 class RendererCdmManager;
 class RendererMediaPlayerManager;
 class RendererPpapiHost;
 class RenderFrameObserver;
 class RenderViewImpl;
 class RenderWidget;
 class RenderWidgetFullscreenPepper;
 class ScreenOrientationDispatcher;
 class UserMediaClientImpl;
 enum class SandboxFlags;
-struct CommitNavigationParams;
 struct CommonNavigationParams;
 struct CustomContextMenuContext;
 struct FrameReplicationState;
-struct HistoryNavigationParams;
 struct RequestNavigationParams;
 struct ResourceResponseHead;
 struct StartNavigationParams;
 
 class CONTENT_EXPORT RenderFrameImpl
     : public RenderFrame,
       NON_EXPORTED_BASE(public blink::WebFrameClient),
       NON_EXPORTED_BASE(public media::WebMediaPlayerDelegate) {
  public:
   // Creates a new RenderFrame. |render_view| is the RenderView object that this
@@ skipping 410 matching lines @@
 
   // WebMediaPlayerDelegate implementation:
   void DidPlay(blink::WebMediaPlayer* player) override;
   void DidPause(blink::WebMediaPlayer* player) override;
   void PlayerGone(blink::WebMediaPlayer* player) override;
 
   // TODO(nasko): Make all tests in RenderViewImplTest friends and then move
   // this back to private member.
   void OnNavigate(const CommonNavigationParams& common_params,
                   const StartNavigationParams& start_params,
-                  const CommitNavigationParams& commit_params,
-                  const HistoryNavigationParams& history_params);
+                  const RequestNavigationParams& request_params);
 
   // Make this frame show an empty, unscriptable page.
   // TODO(nasko): Remove this method once swapped out state is no longer used.
   void NavigateToSwappedOutURL();
 
   // Binds this render frame's service registry.
   void BindServiceRegistry(
       mojo::InterfaceRequest<mojo::ServiceProvider> services,
       mojo::ServiceProviderPtr exposed_services);
 
@@ skipping 87 matching lines @@
   void OnSelectPopupMenuItems(bool canceled,
                               const std::vector<int>& selected_indices);
 #elif defined(OS_MACOSX)
   void OnSelectPopupMenuItem(int selected_index);
   void OnCopyToFindPboard();
 #endif
 
   void OnCommitNavigation(const ResourceResponseHead& response,
                           const GURL& stream_url,
                           const CommonNavigationParams& common_params,
-                          const CommitNavigationParams& commit_params,
-                          const HistoryNavigationParams& history_params);
+                          const RequestNavigationParams& request_params);
 
   // Virtual since overridden by WebTestProxy for layout tests.
   virtual blink::WebNavigationPolicy DecidePolicyForNavigation(
       RenderFrame* render_frame,
       const NavigationPolicyInfo& info);
   void OpenURL(blink::WebFrame* frame,
                const GURL& url,
                const Referrer& referrer,
                blink::WebNavigationPolicy policy);
 
@@ skipping 46 matching lines @@
 
   // Creates a factory object used for creating audio and video renderers.
   // The method is virtual so that layouttests can override it.
   virtual scoped_ptr<MediaStreamRendererFactory> CreateRendererFactory();
 
   // Checks that the RenderView is ready to display the navigation to |url|. If
   // the return value is false, the navigation should be abandoned.
   bool PrepareRenderViewForNavigation(
       const GURL& url,
       bool is_history_navigation,
-      const HistoryNavigationParams& history_params,
+      const RequestNavigationParams& request_params,
       bool* is_reload,
       blink::WebURLRequest::CachePolicy* cache_policy);
 
   // PlzNavigate
   // Sends a FrameHostMsg_BeginNavigation to the browser based on the contents
   // of the WebURLRequest.
   void BeginNavigation(blink::WebURLRequest* request);
 
   // Loads a data url.
   void LoadDataURL(const CommonNavigationParams& params,
@@ skipping 164 matching lines @@
 #endif
 
   base::WeakPtrFactory<RenderFrameImpl> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderFrameImpl);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_RENDER_FRAME_IMPL_H_