PlzNavigate: don't discard pending entry in DidFailProvisionalLoad

content/browser/frame_host/navigator_impl.cc

Index: content/browser/frame_host/navigator_impl.cc
diff --git a/content/browser/frame_host/navigator_impl.cc b/content/browser/frame_host/navigator_impl.cc
index 546b119998156517090926bdd6a008662d2bfe13..acb5b155ab0f36103fab698697f7c1c0dcd67925 100644
--- a/content/browser/frame_host/navigator_impl.cc
+++ b/content/browser/frame_host/navigator_impl.cc
@@ -227,7 +227,12 @@ void NavigatorImpl::DidFailProvisionalLoadWithError(
     // TODO(creis): Find a way to cancel any pending RFH here.
   }
 
-  DiscardPendingEntryOnFailureIfNeeded(render_frame_host->navigation_handle());
+  // Discard the pending navigation entry if needed.
+  // PlzNavigate: the entry has already been discarded in DidFailNavigation.

[Charlie Reis, 2016/04/11 21:10:57]

s/DidFailNavigation/FailedNavigation/

(Same in CL description and throughout the CL.)

[clamy, 2016/04/12 14:08:01]

Done.

+  if (!IsBrowserSideNavigationEnabled()) {
+    DiscardPendingEntryOnFailureIfNeeded(
+        render_frame_host->navigation_handle());
+  }
 
   if (delegate_)
     delegate_->DidFailProvisionalLoadWithError(render_frame_host, params);