Revert of Cleaned up old navigation code that did not use pending navigation item.

ios/web/interstitials/web_interstitial_impl.mm

 // 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.
 
 #import "ios/web/interstitials/web_interstitial_impl.h"
 
 #include "base/logging.h"
 #include "ios/web/interstitials/web_interstitial_facade_delegate.h"
 #import "ios/web/navigation/crw_session_controller.h"
 #import "ios/web/navigation/navigation_manager_impl.h"
@@ skipping 66 matching lines @@
 }
 
 void WebInterstitialImpl::DontProceed() {
   // Proceed() and DontProceed() are not re-entrant, as they delete |this|.
   if (action_taken_)
     return;
   action_taken_ = true;
 
   // Clear the pending entry, since that's the page that's not being
   // proceeded to.
-  GetWebStateImpl()->GetNavigationManager()->DiscardNonCommittedItems();
+  NavigationManager* nav_manager = GetWebStateImpl()->GetNavigationManager();
+  nav_manager->DiscardNonCommittedItems();
 
   Hide();
 
   GetDelegate()->OnDontProceed();
 
+  NSUserDefaults* user_defaults = [NSUserDefaults standardUserDefaults];
+  if (![user_defaults boolForKey:@"PendingIndexNavigationDisabled"]) {
+    // Reload last committed entry.
+    nav_manager->Reload(ReloadType::NORMAL, true /* check_for_repost */);
+  }
+
   delete this;
 }
 
 void WebInterstitialImpl::Proceed() {
   // Proceed() and DontProceed() are not re-entrant, as they delete |this|.
   if (action_taken_)
     return;
   action_taken_ = true;
   Hide();
   GetDelegate()->OnProceed();
   delete this;
 }
 
 void WebInterstitialImpl::WebStateDestroyed() {
   DontProceed();
 }
 
 WebStateImpl* WebInterstitialImpl::GetWebStateImpl() const {
   return static_cast<web::WebStateImpl*>(web_state());
 }
 
 }  // namespace web