Store NavigationEntryImpl data into NavigationRequest for later usage.

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"

[clamy, 2015/01/19 15:53:46]

Why did you remove the forward declaration in favor of an include?

[carlosk, 2015/01/19 16:08:52]

It was required now because of the restore_type() getter returning a
NavigationEntryImpl::RestoreType (incomplete type error otherwise).

[clamy, 2015/01/19 16:11:10]

Acknowledged.

 #include "content/browser/loader/navigation_url_loader_delegate.h"
 #include "content/common/content_export.h"
 #include "content/common/navigation_params.h"
 
 namespace content {
 
 class FrameTreeNode;
 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
 // the navigation following its refactoring.
 class CONTENT_EXPORT NavigationRequest : public NavigationURLLoaderDelegate {
  public:
@@ skipping 14 matching lines @@
     // is one of the two final states for the request.
     RESPONSE_STARTED,
 
     // The request failed on the IO thread and an error page should be
     // displayed. This is one of the two final states for the request.
     FAILED,
   };
 
   NavigationRequest(FrameTreeNode* frame_tree_node,
                     const CommonNavigationParams& common_params,
-                    const CommitNavigationParams& commit_params);
+                    const CommitNavigationParams& commit_params,
+                    const NavigationEntryImpl* navitation_entry);
 
   ~NavigationRequest() override;
 
   // Called on the UI thread by the RenderFrameHostManager which owns the
   // NavigationRequest. Takes ownership of |info|. After calling this function,
   // |body| can no longer be manipulated on the UI thread.
   void BeginNavigation(scoped_ptr<NavigationRequestInfo> info,
                        scoped_refptr<ResourceRequestBody> body);
 
   CommonNavigationParams& common_params() { return common_params_; }
 
+  const CommonNavigationParams& common_params() const { return common_params_; }
+
   const CommitNavigationParams& commit_params() const { return commit_params_; }
 
   NavigationURLLoader* loader_for_testing() const { return loader_.get(); }
 
   NavigationState state() const { return state_; }
 
+  SiteInstanceImpl* source_site_instance() const {
+    return source_site_instance_.get();
+  }
+
+  SiteInstanceImpl* dest_site_instance() const {
+    return dest_site_instance_.get();
+  }
+
+  NavigationEntryImpl::RestoreType restore_type() const {
+    return restore_type_;
+  };
+
+  bool is_view_source() const { return is_view_source_; };
+
+  int bindings() const { return bindings_; };
+
   void SetWaitingForRendererResponse() {
     DCHECK(state_ == NOT_STARTED);
     state_ = WAITING_FOR_RENDERER_RESPONSE;
   }
 
  private:
   // 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;
 
   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 CommitNavigationParams commit_params_;
 
   NavigationState state_;
 
   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_