Commit f97970c1 authored by avi's avatar avi Committed by Commit bot

Ensure the new navigation classifier works in the real world.

BUG=369661
TEST=No whammies!

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

Cr-Commit-Position: refs/heads/master@{#329497}
parent f0673029
...@@ -821,7 +821,6 @@ bool NavigationControllerImpl::RendererDidNavigate( ...@@ -821,7 +821,6 @@ bool NavigationControllerImpl::RendererDidNavigate(
// Do navigation-type specific actions. These will make and commit an entry. // Do navigation-type specific actions. These will make and commit an entry.
details->type = ClassifyNavigation(rfh, params); details->type = ClassifyNavigation(rfh, params);
#if DCHECK_IS_ON()
// For site-per-process, both ClassifyNavigation methods get it wrong (see // 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 // http://crbug.com/464014) so don't worry about a mismatch if that's the
// case. // case.
...@@ -833,10 +832,9 @@ bool NavigationControllerImpl::RendererDidNavigate( ...@@ -833,10 +832,9 @@ bool NavigationControllerImpl::RendererDidNavigate(
// TODO(avi): Work this out. // TODO(avi): Work this out.
if (details->type != NAVIGATION_TYPE_SAME_PAGE && if (details->type != NAVIGATION_TYPE_SAME_PAGE &&
new_type != NAVIGATION_TYPE_SAME_PAGE) { new_type != NAVIGATION_TYPE_SAME_PAGE) {
DCHECK_EQ(details->type, new_type); CHECK_EQ(details->type, new_type);
} }
} }
#endif // DCHECK_IS_ON()
// is_in_page must be computed before the entry gets committed. // is_in_page must be computed before the entry gets committed.
details->is_in_page = AreURLsInPageNavigation(rfh->GetLastCommittedURL(), details->is_in_page = AreURLsInPageNavigation(rfh->GetLastCommittedURL(),
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment