Solidify Entry discarding logic (NavigationHandle keeps its ID)

content/browser/frame_host/navigation_handle_impl.h

 // Copyright 2015 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_HANDLE_IMPL_H_
 #define CONTENT_BROWSER_FRAME_HOST_NAVIGATION_HANDLE_IMPL_H_
 
 #include "content/public/browser/navigation_handle.h"
 
 #include <stddef.h>
@@ skipping 52 matching lines @@
 // the RenderFrameHost still apply.
 class CONTENT_EXPORT NavigationHandleImpl : public NavigationHandle {
  public:
   // |navigation_start| comes from the DidStartProvisionalLoad IPC, which tracks
   // both renderer-initiated and browser-initiated navigation start.
   // PlzNavigate: This value always comes from the CommonNavigationParams
   // associated with this navigation.
   static scoped_ptr<NavigationHandleImpl> Create(
       const GURL& url,
       FrameTreeNode* frame_tree_node,
-      const base::TimeTicks& navigation_start);
+      const base::TimeTicks& navigation_start,
+      const NavigationEntry* pending_nav_entry);
   ~NavigationHandleImpl() override;
 
   // NavigationHandle implementation:
   const GURL& GetURL() override;
   bool IsInMainFrame() override;
   const base::TimeTicks& NavigationStart() override;
   bool IsPost() override;
   const Referrer& GetReferrer() override;
   bool HasUserGesture() override;
   ui::PageTransition GetPageTransition() override;
@@ skipping 21 matching lines @@
       bool new_is_external_protocol) override;
 
   NavigatorDelegate* GetDelegate() const;
 
   // Returns the response headers for the request. This can only be accessed
   // after a redirect was encountered or after the the navigation is ready to
   // commit. It should not be modified, as modifications will not be reflected
   // in the network stack.
   const net::HttpResponseHeaders* GetResponseHeaders();
 
+  // Get the corresponding id from the NavigationEntry associated with this

[Charlie Reis, 2016/02/06 00:54:58]

nit: s/corresponding/unique/

[Charlie Harrison, 2016/02/08 15:06:41]

Done.

+  // NavigationHandle. Note that a synchronous, renderer-initiated navigation
+  // will not have a valid id. It will be 0.

[Charlie Reis, 2016/02/06 00:54:58]

nit: will not have a NavigationEntry associated with it, and this will return 0.

[Charlie Harrison, 2016/02/08 15:06:41]

Done.

+  int pending_nav_entry_id() const { return pending_nav_entry_id_; }
+
   void set_net_error_code(net::Error net_error_code) {
     net_error_code_ = net_error_code;
   }
 
   // Returns whether the navigation is currently being transferred from one
   // RenderFrameHost to another. In particular, a DidStartProvisionalLoad IPC
   // for the navigation URL, received in the new RenderFrameHost, should not
   // indicate the start of a new navigation in that case.
   bool is_transferring() const { return is_transferring_; }
   void set_is_transferring(bool is_transferring) {
@@ skipping 83 matching lines @@
     CANCELING,
     WILL_PROCESS_RESPONSE,
     DEFERRING_RESPONSE,
     READY_TO_COMMIT,
     DID_COMMIT,
     DID_COMMIT_ERROR_PAGE,
   };
 
   NavigationHandleImpl(const GURL& url,
                        FrameTreeNode* frame_tree_node,
-                       const base::TimeTicks& navigation_start);
+                       const base::TimeTicks& navigation_start,
+                       const NavigationEntry* pending_nav_entry);
 
   NavigationThrottle::ThrottleCheckResult CheckWillStartRequest();
   NavigationThrottle::ThrottleCheckResult CheckWillRedirectRequest();
   NavigationThrottle::ThrottleCheckResult CheckWillProcessResponse();
 
   // Helper function to run and reset the |complete_callback_|. This marks the
   // end of a round of NavigationThrottleChecks.
   void RunCompleteCallback(NavigationThrottle::ThrottleCheckResult result);
 
   // Used in tests.
@@ skipping 23 matching lines @@
 
   // A list of Throttles registered for this navigation.
   ScopedVector<NavigationThrottle> throttles_;
 
   // The index of the next throttle to check.
   size_t next_index_;
 
   // The time this navigation started.
   const base::TimeTicks navigation_start_;
 
+  // The unique id of the corresponding NavigationEntry.
+  const int pending_nav_entry_id_;
+
   // This callback will be run when all throttle checks have been performed.
   ThrottleChecksFinishedCallback complete_callback_;
 
   // PlzNavigate
   // Manages the lifetime of a pre-created ServiceWorkerProviderHost until a
   // corresponding ServiceWorkerNetworkProvider is created in the renderer.
   scoped_ptr<ServiceWorkerNavigationHandle> service_worker_handle_;
 
   DISALLOW_COPY_AND_ASSIGN(NavigationHandleImpl);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_FRAME_HOST_NAVIGATION_HANDLE_IMPL_H_