Revert of Ensure the new navigation classifier works in the real world.

content/browser/frame_host/navigation_controller_impl.cc

Index: content/browser/frame_host/navigation_controller_impl.cc
diff --git a/content/browser/frame_host/navigation_controller_impl.cc b/content/browser/frame_host/navigation_controller_impl.cc
index d34be5d18f4301301bc8516dcf4fe6d90cda8512..08555a3f9c5714cf6bfab46bbce3a8887d95cdc7 100644
--- a/content/browser/frame_host/navigation_controller_impl.cc
+++ b/content/browser/frame_host/navigation_controller_impl.cc
@@ -821,6 +821,7 @@
 
   // 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 @@
     // 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(),