Revert of Solidify Entry discarding logic (NavigationHandle keeps its ID)

content/browser/frame_host/navigation_handle_impl.h

Index: content/browser/frame_host/navigation_handle_impl.h
diff --git a/content/browser/frame_host/navigation_handle_impl.h b/content/browser/frame_host/navigation_handle_impl.h
index ba4190dd0c8206bd0c164e8f500b9123bda32435..facb4f83ce37e8bc502dec06c298ab08c5291727 100644
--- a/content/browser/frame_host/navigation_handle_impl.h
+++ b/content/browser/frame_host/navigation_handle_impl.h
@@ -72,8 +72,7 @@
       FrameTreeNode* frame_tree_node,
       bool is_synchronous,
       bool is_srcdoc,
-      const base::TimeTicks& navigation_start,
-      int pending_nav_entry_id);
+      const base::TimeTicks& navigation_start);
   ~NavigationHandleImpl() override;
 
   // NavigationHandle implementation:
@@ -121,11 +120,6 @@
   // as modifications will not be reflected in the network stack.
   const net::HttpResponseHeaders* GetResponseHeaders();
 
-  // Get the unique id from the NavigationEntry associated with this
-  // NavigationHandle. Note that a synchronous, renderer-initiated navigation
-  // will not have a NavigationEntry associated with it, and this will return 0.
-  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;
   }
@@ -228,8 +222,7 @@
                        FrameTreeNode* frame_tree_node,
                        bool is_synchronous,
                        bool is_srcdoc,
-                       const base::TimeTicks& navigation_start,
-                       int pending_nav_entry_id);
+                       const base::TimeTicks& navigation_start);
 
   NavigationThrottle::ThrottleCheckResult CheckWillStartRequest();
   NavigationThrottle::ThrottleCheckResult CheckWillRedirectRequest();
@@ -276,9 +269,6 @@
   // 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_;