Fix NavigationControllerBrowserTest. EnsureSamePageNavigationUpdatesFrameNavigationEntry browser nav

content/browser/frame_host/navigation_controller_impl.h

Index: content/browser/frame_host/navigation_controller_impl.h
diff --git a/content/browser/frame_host/navigation_controller_impl.h b/content/browser/frame_host/navigation_controller_impl.h
index f7b9144c75e2c4f80cca3fcb785b71401a38a433..d1291bb7d129adcdf51cc362f17d68cd0eb909b4 100644
--- a/content/browser/frame_host/navigation_controller_impl.h
+++ b/content/browser/frame_host/navigation_controller_impl.h
@@ -207,6 +207,10 @@ class CONTENT_EXPORT NavigationControllerImpl
   // entry is being discarded because it failed to load.
   void DiscardPendingEntry(bool was_failure);
 
+  // Sets a flag on the pending NavigationEntryImpl instance if any that the
+  // navigation failed due to an SSL error.
+  void SetPendingNavigationSSLError(bool error);
+
  private:
   friend class RestoreHelper;
 
@@ -368,6 +372,10 @@ class CONTENT_EXPORT NavigationControllerImpl
   // the memory management.
   NavigationEntryImpl* pending_entry_;
 
+  // Navigations could occur in succession. This field holds the last pending
+  // entry for which we haven't received a response yet.
+  NavigationEntryImpl* last_pending_entry_;

[scottmg, 2016/12/20 22:34:05]

Does this need to be a raw pointer?

[ananta, 2016/12/20 23:14:10]

This is on the same lines as pending_entry_ which is deleted in the
DiscardPendingEntry function.

+
   // If a new entry fails loading, details about it are temporarily held here
   // until the error page is shown (or 0 otherwise).
   //
@@ -392,6 +400,13 @@ class CONTENT_EXPORT NavigationControllerImpl
   // after the transient entry will become invalid if you navigate forward.
   int transient_entry_index_;
 
+  // The index of the last pending entry if it is in entries, or -1 if it was
+  // created by LoadURL.
+  int last_pending_entry_index_;
+
+  // The index of the last transient entry. Defaults to -1.
+  int last_transient_entry_index_;
+
   // The delegate associated with the controller. Possibly NULL during
   // setup.
   NavigationControllerDelegate* delegate_;