Skip to content

Commit

Permalink
Revert of Ensure the new navigation classifier works in the real worl…
Browse files Browse the repository at this point in the history
…d. (patchset #1 id:1 of https://codereview.chromium.org/1136663004/)

Reason for revert:
Occasional crashes.

Original issue's description:
> Ensure the new navigation classifier works in the real world.
>
> BUG=369661
> TEST=No whammies!
>
> Committed: https://crrev.com/f97970c11c08a18e9ecea0b1b4c77122371a0e4f
> Cr-Commit-Position: refs/heads/master@{#329497}

TBR=creis@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=369661

Review URL: https://codereview.chromium.org/1140123002

Cr-Commit-Position: refs/heads/master@{#329849}
  • Loading branch information
avi authored and Commit bot committed May 14, 2015
1 parent b86405e commit 84c0386
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion content/browser/frame_host/navigation_controller_impl.cc
Original file line number Diff line number Diff line change
Expand Up @@ -821,6 +821,7 @@ bool NavigationControllerImpl::RendererDidNavigate(

// Do navigation-type specific actions. These will make and commit an entry.
details->type = ClassifyNavigation(rfh, params);
#if DCHECK_IS_ON()
// For site-per-process, both ClassifyNavigation methods get it wrong (see
// http://crbug.com/464014) so don't worry about a mismatch if that's the
// case.
Expand All @@ -832,9 +833,10 @@ bool NavigationControllerImpl::RendererDidNavigate(
// TODO(avi): Work this out.
if (details->type != NAVIGATION_TYPE_SAME_PAGE &&
new_type != NAVIGATION_TYPE_SAME_PAGE) {
CHECK_EQ(details->type, new_type);
DCHECK_EQ(details->type, new_type);
}
}
#endif // DCHECK_IS_ON()

// is_in_page must be computed before the entry gets committed.
details->is_in_page = AreURLsInPageNavigation(rfh->GetLastCommittedURL(),
Expand Down

0 comments on commit 84c0386

Please sign in to comment.