Ensure that the PlzNavigate code path removes pending NavigationEntrys if the navigation is cancell…

Ensure that the PlzNavigate code path removes pending NavigationEntrys if the navigation is cancelled.

For the old code paths, this is done by NavigatorImpl::DidFailProvisionalLoadWithError. So copy that call.

This fixes
NewTabPageTest#testUrlFocusAnimationsEnabledOnFailedLoad

BUG=699387
CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.linux:linux_site_isolation
R=cblume@chromium.org, creis@chromium.org

Review-Url: https://codereview.chromium.org/2768933004 .
Cr-Commit-Position: refs/heads/master@{#459473}
Committed: https://chromium.googlesource.com/chromium/src/+/adbac71e30fdf997eb5b543da155b08542f88c71

[jam, 2017-03-24 01:33:16]

Description was changed from

==========
Ensure that the PlzNavigate code path removes pending NavigationEntrys if the
navigation is cancelled.

For the old code paths, this is done by
NavigatorImpl::DidFailProvisionalLoadWithError. So copy that call.

This fixes
NewTabPageTest#testUrlFocusAnimationsEnabledOnFailedLoad

BUG=699387
==========

to

==========
Ensure that the PlzNavigate code path removes pending NavigationEntrys if the
navigation is cancelled.

For the old code paths, this is done by
NavigatorImpl::DidFailProvisionalLoadWithError. So copy that call.

This fixes
NewTabPageTest#testUrlFocusAnimationsEnabledOnFailedLoad

BUG=699387
CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.linux:linux_site_isolation
==========

[jam, 2017-03-24 01:34:22]

The CQ bit was checked by jam@chromium.org to run a CQ dry run

[commit-bot: I haz the power, 2017-03-24 01:34:36]

Dry run: CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[jam, 2017-03-24 01:36:00]

The CQ bit was checked by jam@chromium.org to run a CQ dry run

[jam, 2017-03-24 01:36:19]

Description was changed from

==========
Ensure that the PlzNavigate code path removes pending NavigationEntrys if the
navigation is cancelled.

For the old code paths, this is done by
NavigatorImpl::DidFailProvisionalLoadWithError. So copy that call.

This fixes
NewTabPageTest#testUrlFocusAnimationsEnabledOnFailedLoad

BUG=699387
CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.linux:linux_site_isolation
==========

to

==========
Ensure that the PlzNavigate code path removes pending NavigationEntrys if the
navigation is cancelled.

For the old code paths, this is done by
NavigatorImpl::DidFailProvisionalLoadWithError. So copy that call.

This fixes
NewTabPageTest#testUrlFocusAnimationsEnabledOnFailedLoad

BUG=699387
==========

[commit-bot: I haz the power, 2017-03-24 01:36:30]

Dry run: CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[jam, 2017-03-24 01:36:54]

jam@chromium.org changed reviewers:
+ cblume@chromium.org

[jam, 2017-03-24 01:37:09]

Description was changed from

==========
Ensure that the PlzNavigate code path removes pending NavigationEntrys if the
navigation is cancelled.

For the old code paths, this is done by
NavigatorImpl::DidFailProvisionalLoadWithError. So copy that call.

This fixes
NewTabPageTest#testUrlFocusAnimationsEnabledOnFailedLoad

BUG=699387
==========

to

==========
Ensure that the PlzNavigate code path removes pending NavigationEntrys if the
navigation is cancelled.

For the old code paths, this is done by
NavigatorImpl::DidFailProvisionalLoadWithError. So copy that call.

This fixes
NewTabPageTest#testUrlFocusAnimationsEnabledOnFailedLoad

BUG=699387
CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.linux:linux_site_isolation
==========

[jam, 2017-03-24 01:55:19]

Thanks for tracking this down to stops leaving a pending entry.

[cblume, 2017-03-24 02:34:52]

LGTM

I like the very specific test, too.

[commit-bot: I haz the power, 2017-03-24 03:24:59]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2017-03-24 03:25:00]

Dry run: Try jobs failed on following builders:
  linux_chromium_asan_rel_ng on master.tryserver.chromium.linux (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.linux/builders/linux_chromium_...)

[cblume, 2017-03-24 03:30:01]

The CQ bit was checked by cblume@chromium.org

[commit-bot: I haz the power, 2017-03-24 03:30:32]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2017-03-24 03:30:32]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2017-03-24 03:30:33]

No L-G-T-M from a valid reviewer yet.
CQ run can only be started once the patch has received an L-G-T-M from a full
committer.
Even if an L-G-T-M may have been provided, it was from a non-committer,_not_ a
full super star committer.
Committers are members of the group "project-chromium-committers".
Note that this has nothing to do with OWNERS files.

[jam, 2017-03-24 16:44:49]

jam@chromium.org changed reviewers:
+ creis@chromium.org

[jam, 2017-03-24 16:44:50]

+Charlie

[jam, 2017-03-24 17:00:44]

(note to self: the try runs with plznavigate enabled had a lot of flake/infra
failures yesterday, as did other cls of mine. here's a try now of patchset 1
that is green: https://codereview.chromium.org/2770943006/)

[Charlie Reis, 2017-03-24 17:13:36]

LGTM

[jam, 2017-03-24 17:15:14]

The CQ bit was checked by jam@chromium.org

[commit-bot: I haz the power, 2017-03-24 17:15:56]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2017-03-24 17:48:12]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2017-03-24 17:48:13]

Failed to apply patch for content/browser/frame_host/frame_tree_node.cc:
While running git apply --index -p1;
  error: patch failed: content/browser/frame_host/frame_tree_node.cc:497
  error: content/browser/frame_host/frame_tree_node.cc: patch does not apply

Patch:       content/browser/frame_host/frame_tree_node.cc
Index: content/browser/frame_host/frame_tree_node.cc
diff --git a/content/browser/frame_host/frame_tree_node.cc
b/content/browser/frame_host/frame_tree_node.cc
index
2fdd79c55b1d9dc58ea8b75bce1127ca4e190dbb..1461438152b61e69e1dfef3a2d3d588840bd1532
100644
--- a/content/browser/frame_host/frame_tree_node.cc
+++ b/content/browser/frame_host/frame_tree_node.cc
@@ -497,8 +497,10 @@ void FrameTreeNode::DidChangeLoadProgress(double
load_progress) {
 bool FrameTreeNode::StopLoading() {
   if (IsBrowserSideNavigationEnabled()) {
     if (navigation_request_) {
-      navigation_request_->navigation_handle()->set_net_error_code(
+      navigation_request_->navigation_handle()->set_net_error_code(
           net::ERR_ABORTED);
+      navigator_->DiscardPendingEntryIfNeeded(
+          navigation_request_->navigation_handle());
     }
     ResetNavigationRequest(false);
   }

[jam, 2017-03-24 18:03:54]

Description was changed from

==========
Ensure that the PlzNavigate code path removes pending NavigationEntrys if the
navigation is cancelled.

For the old code paths, this is done by
NavigatorImpl::DidFailProvisionalLoadWithError. So copy that call.

This fixes
NewTabPageTest#testUrlFocusAnimationsEnabledOnFailedLoad

BUG=699387
CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.linux:linux_site_isolation
==========

to

==========
Ensure that the PlzNavigate code path removes pending NavigationEntrys if the
navigation is cancelled.

For the old code paths, this is done by
NavigatorImpl::DidFailProvisionalLoadWithError. So copy that call.

This fixes
NewTabPageTest#testUrlFocusAnimationsEnabledOnFailedLoad

BUG=699387
CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.linux:linux_site_isolation
R=cblume@chromium.org, creis@chromium.org

Review-Url: https://codereview.chromium.org/2768933004 .
Cr-Commit-Position: refs/heads/master@{#459473}
Committed:
https://chromium.googlesource.com/chromium/src/+/adbac71e30fdf997eb5b543da155...
==========

[jam, 2017-03-24 18:03:55]

Committed patchset #2 (id:20001) manually as
adbac71e30fdf997eb5b543da155b08542f88c71 (presubmit successful).