From 84c0386b28a287c3dc3d9222a70d04492094491c Mon Sep 17 00:00:00 2001 From: avi Date: Thu, 14 May 2015 08:00:26 -0700 Subject: [PATCH] Revert of Ensure the new navigation classifier works in the real world. (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} --- content/browser/frame_host/navigation_controller_impl.cc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/content/browser/frame_host/navigation_controller_impl.cc b/content/browser/frame_host/navigation_controller_impl.cc index 12a7c755239709..95f5f1307ea128 100644 --- a/content/browser/frame_host/navigation_controller_impl.cc +++ b/content/browser/frame_host/navigation_controller_impl.cc @@ -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. @@ -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(),