Show IDN in error screens (DNS failure etc.)

chrome/renderer/net/net_error_helper.cc

 // Copyright (c) 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 "chrome/renderer/net/net_error_helper.h"
 
 #include <string>
 
 #include "base/json/json_writer.h"
 #include "base/metrics/histogram.h"
@@ skipping 156 matching lines @@
 
   return handled;
 }
 
 // static
 bool NetErrorHelper::GetErrorStringsForDnsProbe(
     WebKit::WebFrame* frame,
     const WebKit::WebURLError& error,
     bool is_failed_post,
     const std::string& locale,
+    const std::string& accept_languages,
     base::DictionaryValue* error_strings) {
   if (!IsMainFrame(frame))
     return false;
 
   if (!IsDnsError(error))
     return false;
 
   // Get the strings for a fake "DNS probe possible" error.
   LocalizedError::GetStrings(
       chrome_common_net::DNS_PROBE_POSSIBLE,
       chrome_common_net::kDnsProbeErrorDomain,
       error.unreachableURL,
-      is_failed_post, locale, error_strings);
+      is_failed_post, locale, accept_languages, error_strings);
   return true;
 }
 
 void NetErrorHelper::OnNetErrorInfo(int status_num) {
   DCHECK(status_num >= 0 && status_num < chrome_common_net::DNS_PROBE_MAX);
 
   DVLOG(1) << "Received status " << DnsProbeStatusToString(status_num);
 
   DnsProbeStatus status = static_cast<DnsProbeStatus>(status_num);
   DCHECK_NE(chrome_common_net::DNS_PROBE_POSSIBLE, status);
 
   if (!(last_fail_was_dns_error_ || forwarding_probe_results_)) {
     DVLOG(1) << "Ignoring NetErrorInfo: no DNS error";
     return;
   }
 
   last_probe_status_ = status;
 
   if (forwarding_probe_results_)
     UpdateErrorPage();
 }
 
 void NetErrorHelper::UpdateErrorPage() {
   DCHECK(forwarding_probe_results_);
 
   WebKit::WebURLError error = GetUpdatedError();
   base::DictionaryValue error_strings;
+  const std::string accept_languages =
+      render_view() ? render_view()->GetAcceptLanguages() : std::string();

[mmenke, 2013/09/26 16:23:01]

The test that render_view() isn't NULL isn't needed - this object lasts for
exactly the lifetime of the RenderView passed into its cosntructor.

[yuusuke, 2013/09/27 14:16:52]

Done.

   LocalizedError::GetStrings(error.reason,
                              error.domain.utf8(),
                              error.unreachableURL,
                              is_failed_post_,
                              RenderThread::Get()->GetLocale(),
+                             accept_languages,
                              &error_strings);
 
   std::string json;
   JSONWriter::Write(&error_strings, &json);
 
   std::string js = "if (window.updateForDnsProbe) "
                    "updateForDnsProbe(" + json + ");";
   string16 js16;
   if (!UTF8ToUTF16(js.c_str(), js.length(), &js16)) {
     NOTREACHED();
@@ skipping 21 matching lines @@
   }
 
   WebKit::WebURLError error;
   error.domain = WebKit::WebString::fromUTF8(
       chrome_common_net::kDnsProbeErrorDomain);
   error.reason = last_probe_status_;
   error.unreachableURL = last_error_.unreachableURL;
 
   return error;
 }