PlzNavigate: don't discard pending entry in DidFailProvisionalLoad

content/browser/frame_host/navigation_controller_impl_unittest.cc

Index: content/browser/frame_host/navigation_controller_impl_unittest.cc
diff --git a/content/browser/frame_host/navigation_controller_impl_unittest.cc b/content/browser/frame_host/navigation_controller_impl_unittest.cc
index a4f4abab004d9c53a1dbb575e1ec5dca4d400289..155b96011385e4b597bef9891730a70f193a7cd7 100644
--- a/content/browser/frame_host/navigation_controller_impl_unittest.cc
+++ b/content/browser/frame_host/navigation_controller_impl_unittest.cc
@@ -416,6 +416,16 @@ TEST_F(NavigationControllerTest, GoToOffset) {
 // is being aborted. This caused the last committed entry to be displayed in
 // the omnibox, which is the entry before A was created.
 TEST_F(NavigationControllerTest, DontDiscardWrongPendingEntry) {
+  // PlzNavigate: Entries are not discarded following the reception of
+  // DidFailProvisionalLoad. They are discarded in DidFailNavigation, when we
+  // still have the NavigationRequest. Since every change of the
+  // NavigationEntry would cause the NavigationRequest to go away, the right
+  // pending NavigationEntry will be discarded in DidFailNavigation.
+  if (IsBrowserSideNavigationEnabled()) {
+    SUCCEED() << "PlzNavigate: test not applicable.";

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

I'm a bit nervous removing coverage for this without an equivalent PlzNavigate
test, but I'll take your word for it.  :)

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

I've made a few changes that enable the test to test something a bit similar on
PlzNavigate (what if we start a new navigation in the middle of committing an
error page, which would send a DidFailProvisionalLoad after we created a pending
entry for the new navigation).

+    return;
+  }
+
   NavigationControllerImpl& controller = controller_impl();
   GURL initial_url("http://www.google.com");
   GURL url_1("http://foo.com");