Display DNS probe results.

chrome/renderer/chrome_content_renderer_client.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/renderer/chrome_content_renderer_client.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "base/path_service.h"
@@ skipping 817 matching lines @@
   if (!LocalizedError::HasStrings(LocalizedError::kHttpErrorDomain,
                                   http_status_code)) {
     return false;
   }
 
   *error_domain = LocalizedError::kHttpErrorDomain;
   return true;
 }
 
 void ChromeContentRendererClient::GetNavigationErrorStrings(
-    WebKit::WebFrame* /* frame */,
+    WebKit::WebFrame* frame,
     const WebKit::WebURLRequest& failed_request,
     const WebKit::WebURLError& error,
     std::string* error_html,
     string16* error_description) {
   const GURL failed_url = error.unreachableURL;
   const Extension* extension = NULL;
 
   if (failed_url.is_valid() &&
       !failed_url.SchemeIs(extensions::kExtensionScheme)) {
     extension = extension_dispatcher_->extensions()->GetExtensionOrAppByURL(
         ExtensionURLInfo(failed_url));
   }
 
   bool is_post = EqualsASCII(failed_request.httpMethod(), "POST");
 
   if (error_html) {
     // Use a local error page.
     int resource_id;
     DictionaryValue error_strings;
     if (extension && !extension->from_bookmark()) {
       LocalizedError::GetAppErrorStrings(error, failed_url, extension,
                                          &error_strings);
 
       // TODO(erikkay): Should we use a different template for different
       // 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)) {

[mmenke, 2013/06/13 20:04:55]

Don't really need an else/if here, and I don't think it clarifies things.  Can
just use:

if (!...) {
  blah();
}

[Deprecated (see juliatuttle), 2013/06/18 19:36:37]

Done.

+        // We got error strings for the "DNS probe possible" page.
+        // NetErrorHelper will update it later.

[mmenke, 2013/06/13 20:04:55]

nit:  Also, if you keep a comment here, get rid of the "we".

[Deprecated (see juliatuttle), 2013/06/18 19:36:37]

Obsolete.

+      } else {
+        LocalizedError::GetStrings(error, is_post, locale, &error_strings);
+      }
       resource_id = IDR_NET_ERROR_HTML;
     }
 
     const base::StringPiece template_html(
         ResourceBundle::GetSharedInstance().GetRawDataResource(
             resource_id));
     if (template_html.empty()) {
       NOTREACHED() << "unable to load template. ID: " << resource_id;
     } else {
       // "t" is the id of the templates root node.
@@ skipping 344 matching lines @@
 
   if (container->element().shadowHost().isNull())
     return false;
 
   WebString tag_name = container->element().shadowHost().tagName();
   return tag_name.equals(WebString::fromUTF8(kWebViewTagName)) ||
     tag_name.equals(WebString::fromUTF8(kAdViewTagName));
 }
 
 }  // namespace chrome