Make NavigationParams clearer

content/browser/frame_host/navigation_request.h

 // Copyright 2014 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_NAVIGATION_REQUEST_H_
 #define CONTENT_BROWSER_FRAME_HOST_NAVIGATION_REQUEST_H_
 
 #include "base/basictypes.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "content/browser/frame_host/navigation_entry_impl.h"
 #include "content/browser/loader/navigation_url_loader_delegate.h"
 #include "content/common/content_export.h"
 #include "content/common/frame_message_enums.h"
 #include "content/common/navigation_params.h"
 
 namespace content {
 
 class FrameTreeNode;
-class NavigationController;
+class NavigationControllerImpl;
 class NavigationURLLoader;
 class ResourceRequestBody;
 class SiteInstanceImpl;
 struct NavigationRequestInfo;
 
 // PlzNavigate
 // A UI thread object that owns a navigation request until it commits. It
 // ensures the UI thread can start a navigation request in the
 // ResourceDispatcherHost (that lives on the IO thread).
 // TODO(clamy): Describe the interactions between the UI and IO thread during
@@ skipping 50 matching lines @@
   // Called on the UI thread by the Navigator to start the navigation. Returns
   // whether a request was made on the IO thread.
   // TODO(clamy): see if ResourceRequestBody could be un-refcounted to avoid
   // threading subtleties.
   bool BeginNavigation();
 
   const CommonNavigationParams& common_params() const { return common_params_; }
 
   const BeginNavigationParams& begin_params() const { return begin_params_; }
 
-  const CommitNavigationParams& commit_params() const { return commit_params_; }
-
-  const HistoryNavigationParams& history_params() const {
-    return history_params_;
+  const RequestNavigationParams& request_params() const {
+    return request_params_;
   }
 
   NavigationURLLoader* loader_for_testing() const { return loader_.get(); }
 
   NavigationState state() const { return state_; }
 
   SiteInstanceImpl* source_site_instance() const {
     return source_site_instance_.get();
   }
 
@@ skipping 13 matching lines @@
 
   void SetWaitingForRendererResponse() {
     DCHECK(state_ == NOT_STARTED);
     state_ = WAITING_FOR_RENDERER_RESPONSE;
   }
 
  private:
   NavigationRequest(FrameTreeNode* frame_tree_node,
                     const CommonNavigationParams& common_params,
                     const BeginNavigationParams& begin_params,
-                    const CommitNavigationParams& commit_params,
-                    const HistoryNavigationParams& history_params,
+                    const RequestNavigationParams& request_params,
                     scoped_refptr<ResourceRequestBody> body,
                     bool browser_initiated,
                     const NavigationEntryImpl* navitation_entry);
 
   // NavigationURLLoaderDelegate implementation.
   void OnRequestRedirected(
       const net::RedirectInfo& redirect_info,
       const scoped_refptr<ResourceResponse>& response) override;
   void OnResponseStarted(const scoped_refptr<ResourceResponse>& response,
                          scoped_ptr<StreamHandle> body) override;
   void OnRequestFailed(int net_error) override;
   void OnRequestStarted(base::TimeTicks timestamp) override;
 
   FrameTreeNode* frame_tree_node_;
 
   // Initialized on creation of the NavigationRequest. Sent to the renderer when
   // the navigation is ready to commit.
   // Note: When the navigation is ready to commit, the url in |common_params|
   // will be set to the final navigation url, obtained after following all
   // redirects.
   CommonNavigationParams common_params_;
   const BeginNavigationParams begin_params_;
-  const CommitNavigationParams commit_params_;
-  const HistoryNavigationParams history_params_;
+  const RequestNavigationParams request_params_;
   const bool browser_initiated_;
 
   NavigationState state_;
 
 
   // The parameters to send to the IO thread. |loader_| takes ownership of
   // |info_| after calling BeginNavigation.
   scoped_ptr<NavigationRequestInfo> info_;
 
   scoped_ptr<NavigationURLLoader> loader_;
 
   // These next items are used in browser-initiated navigations to store
   // information from the NavigationEntryImpl that is required after request
   // creation time.
   scoped_refptr<SiteInstanceImpl> source_site_instance_;
   scoped_refptr<SiteInstanceImpl> dest_site_instance_;
   NavigationEntryImpl::RestoreType restore_type_;
   bool is_view_source_;
   int bindings_;
 
   DISALLOW_COPY_AND_ASSIGN(NavigationRequest);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_FRAME_HOST_NAVIGATION_REQUEST_H_