Revert of Block redirects to renderer-debug urls.

chrome/browser/captive_portal/captive_portal_tab_helper.cc

 // Copyright (c) 2012 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 "chrome/browser/captive_portal/captive_portal_tab_helper.h"
 
 #include "base/bind.h"
 #include "base/debug/dump_without_crashing.h"
 #include "chrome/browser/captive_portal/captive_portal_login_detector.h"
 #include "chrome/browser/captive_portal/captive_portal_service_factory.h"
@@ skipping 45 matching lines @@
 }
 
 void CaptivePortalTabHelper::DidStartNavigation(
     content::NavigationHandle* navigation_handle) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   if (!navigation_handle->IsInMainFrame() ||
       navigation_handle->IsSameDocument()) {
     return;
   }
 
-  // TODO(clamy): The root cause behind crbug.com/704892 is known.
-  // Remove this code if it is never reached until ~ 2017-July-20.
+  // TODO(clamy): Remove this when we understand the root cause behind
+  // crbug.com/704892.
   if (navigation_handle == navigation_handle_)
     base::debug::DumpWithoutCrashing();
 
   bool was_tracking_navigation = !!navigation_handle_;
   navigation_handle_ = navigation_handle;
 
   // Always track the latest navigation. If a navigation was already tracked,
   // and it committed (either the navigation proper or an error page), it is
   // safe to start tracking the new navigation. Otherwise simulate an abort
   // before reporting the start of the new navigation.
@@ skipping 11 matching lines @@
     return;
   DCHECK(navigation_handle->IsInMainFrame());
   tab_reloader_->OnRedirect(
       navigation_handle->GetURL().SchemeIsCryptographic());
 }
 
 void CaptivePortalTabHelper::DidFinishNavigation(
     content::NavigationHandle* navigation_handle) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
 
+  // TODO(clamy): Remove this when we understand the root cause behind
+  // crbug.com/704892.
+  if (navigation_handle_ && !navigation_handle_->IsInMainFrame())
+    base::debug::DumpWithoutCrashing();
+
   // Exclude subframe navigations.
   if (!navigation_handle->IsInMainFrame())
     return;
 
   // Exclude same-document navigations and aborted navigations that were not
   // being tracked.
   if (navigation_handle_ != navigation_handle &&
       (!navigation_handle->HasCommitted() ||
        navigation_handle->IsSameDocument())) {
     return;
@@ skipping 95 matching lines @@
 }
 
 void CaptivePortalTabHelper::SetTabReloaderForTest(
     CaptivePortalTabReloader* tab_reloader) {
   tab_reloader_.reset(tab_reloader);
 }
 
 CaptivePortalTabReloader* CaptivePortalTabHelper::GetTabReloaderForTest() {
   return tab_reloader_.get();
 }