Convert host names in ACE to Unicode in ElideHost

components/url_formatter/elide_url.cc

 // Copyright 2014 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 "components/url_formatter/elide_url.h"
 
 #include <stddef.h>
 
 #include "base/logging.h"
 #include "base/strings/string_split.h"
@@ skipping 60 matching lines @@
 
   return base::string16();
 }
 
 // Splits the hostname in the |url| into sub-strings for the full hostname,
 // the domain (TLD+1), and the subdomain (everything leading the domain).
 void SplitHost(const GURL& url,
                base::string16* url_host,
                base::string16* url_domain,
                base::string16* url_subdomain) {
-  // Get Host.
-  *url_host = base::UTF8ToUTF16(url.host());
+  // GURL stores IDN hostnames in punycode.  Convert back to Unicode for
+  // display to the user.  (IDNToUnicode() will only perform this conversion
+  // if it's safe to display this host/domain in Unicode.)
+  *url_host = url_formatter::IDNToUnicode(url.host());
 
   // Get domain and registry information from the URL.
-  *url_domain =
-      base::UTF8ToUTF16(net::registry_controlled_domains::GetDomainAndRegistry(
-          url, net::registry_controlled_domains::EXCLUDE_PRIVATE_REGISTRIES));
-  if (url_domain->empty())
-    *url_domain = *url_host;
+  std::string domain_puny =
+      net::registry_controlled_domains::GetDomainAndRegistry(
+          url, net::registry_controlled_domains::EXCLUDE_PRIVATE_REGISTRIES);
+  *url_domain = domain_puny.empty() ?
+      *url_host : url_formatter::IDNToUnicode(domain_puny);
 
   // Add port if required.
   if (!url.port().empty()) {
     *url_host += base::UTF8ToUTF16(":" + url.port());
     *url_domain += base::UTF8ToUTF16(":" + url.port());
   }
 
   // Get sub domain.
   const size_t domain_start_index = url_host->find(*url_domain);
   base::string16 kWwwPrefix = base::UTF8ToUTF16("www.");
@@ skipping 256 matching lines @@
 
 base::string16 FormatUrlForSecurityDisplay(const GURL& url) {
   return FormatUrlForSecurityDisplayInternal(url, false);
 }
 
 base::string16 FormatUrlForSecurityDisplayOmitScheme(const GURL& url) {
   return FormatUrlForSecurityDisplayInternal(url, true);
 }
 
 }  // namespace url_formatter