Display DNS probe results.

chrome/renderer/chrome_content_renderer_client.cc

Index: chrome/renderer/chrome_content_renderer_client.cc
diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer/chrome_content_renderer_client.cc
index fd9a714ffa9e58d8fbe006b559aa6a6d6e8f154f..22629f55d793b96d8660ab97565db77a7cb20eec 100644
--- a/chrome/renderer/chrome_content_renderer_client.cc
+++ b/chrome/renderer/chrome_content_renderer_client.cc
@@ -847,7 +847,7 @@ bool ChromeContentRendererClient::HasErrorPage(int http_status_code,
 }
 
 void ChromeContentRendererClient::GetNavigationErrorStrings(
-    WebKit::WebFrame* /* frame */,
+    WebKit::WebFrame* frame,
     const WebKit::WebURLRequest& failed_request,
     const WebKit::WebURLError& error,
     std::string* error_html,
@@ -875,11 +875,13 @@ void ChromeContentRendererClient::GetNavigationErrorStrings(
       // error messages?
       resource_id = IDR_ERROR_APP_HTML;
     } else {
-      LocalizedError::GetStrings(
-          error,
-          is_post,
-          RenderThread::Get()->GetLocale(),
-          &error_strings);
+      const std::string locale = RenderThread::Get()->GetLocale();
+      if (!NetErrorHelper::GetErrorStringsForDnsProbe(
+              frame, error, is_post, locale, &error_strings)) {
+        // In most cases, the NetErrorHelper won't provide DNS-probe-specific
+        // error pages, so fall back to LocalizedError.
+        LocalizedError::GetStrings(error, is_post, locale, &error_strings);
+      }
       resource_id = IDR_NET_ERROR_HTML;
     }