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

content/browser/frame_host/navigation_controller_impl.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/frame_host/navigation_controller_impl.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
@@ skipping 803 matching lines @@
   // pending parameters that were saved.
   if (params.url_is_unreachable && failed_pending_entry_id_ != 0) {
     details->did_replace_entry = failed_pending_entry_should_replace_;
   } else {
     details->did_replace_entry = pending_entry_ &&
                                  pending_entry_->should_replace_entry();
   }
 
   // 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.
   if (!base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kSitePerProcess)) {
     NavigationType new_type = ClassifyNavigationWithoutPageID(rfh, params);
     // There's constant disagreements over SAME_PAGE between the two classifiers
     // so ignore disagreements if that's the case. Otherwise, enforce agreement.
     // 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(),
       params.url, params.was_within_same_page, rfh);
 
   switch (details->type) {
     case NAVIGATION_TYPE_NEW_PAGE:
       RendererDidNavigateToNewPage(rfh, params, details->did_replace_entry);
       break;
     case NAVIGATION_TYPE_EXISTING_PAGE:
@@ skipping 1168 matching lines @@
     }
   }
 }
 
 void NavigationControllerImpl::SetGetTimestampCallbackForTest(
     const base::Callback<base::Time()>& get_timestamp_callback) {
   get_timestamp_callback_ = get_timestamp_callback;
 }
 
 }  // namespace content