DevTools: Use link doctor for failed provisional load when DevTools are opened.

BUG=94909


Review URL: http://codereview.chromium.org/8021001

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@102595 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 4 insertions, 15 deletions

diff --git a/content/renderer/render_view.cc b/content/renderer/render_view.cc
index c5aab5d..7218dfe 100644
--- a/content/renderer/render_view.cc
+++ b/content/renderer/render_view.cc
@@ -1336,11 +1336,6 @@ void RenderView::LoadNavigationErrorPage(WebFrame* frame,
                                          const WebURLError& error,
                                          const std::string& html,
                                          bool replace) {
-
-  // Do not show alternate error page when DevTools is attached.
-  if (devtools_agent_->IsAttached())
-    return;
-
   std::string alt_html = !html.empty() ? html :
       content::GetContentClient()->renderer()->GetNavigationErrorHtml(
           failed_request, error);
@@ -2505,10 +2500,6 @@ void RenderView::didFailProvisionalLoad(WebFrame* frame,
         navigation_state->request_time()));
   }
 
-  // Do not show alternate error page when DevTools is attached.
-  if (devtools_agent_->IsAttached())
-    return;
-
   // Provide the user with a more helpful error page?
   if (MaybeLoadAlternateErrorPage(frame, error, replace))
     return;
@@ -2787,6 +2778,10 @@ void RenderView::didFinishResourceLoad(
   if (!navigation_state->use_error_page())
     return;
 
+  // Do not show error page when DevTools is attached.
+  if (devtools_agent_->IsAttached())
+    return;
+
   // Display error page, if appropriate.
   int http_status_code = navigation_state->http_status_code();
   if (http_status_code == 404) {
@@ -3156,7 +3151,6 @@ void RenderView::SyncSelectionIfRequired() {
 
 GURL RenderView::GetAlternateErrorPageURL(const GURL& failed_url,
                                           ErrorPageType error_type) {
-
   if (failed_url.SchemeIsSecure()) {
     // If the URL that failed was secure, then the embedding web page was not
     // expecting a network attacker to be able to manipulate its contents.  As
@@ -3166,11 +3160,6 @@ GURL RenderView::GetAlternateErrorPageURL(const GURL& failed_url,
     return GURL();
   }
 
-  if (devtools_agent_->IsAttached()) {
-    // Do not show alternate error page when DevTools is attached.
-    return GURL();
-  }
-
   // Grab the base URL from the browser process.
   if (!alternate_error_page_url_.is_valid())
     return GURL();