Drop |languages| from {Format,Elide}Url* and IDNToUnicode

components/security_interstitials/core/ssl_error_ui.cc

 // Copyright 2015 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/security_interstitials/core/ssl_error_ui.h"
 
 #include "base/i18n/time_formatting.h"
 #include "components/security_interstitials/core/common_string_util.h"
 #include "components/security_interstitials/core/metrics_helper.h"
 #include "components/ssl_errors/error_classification.h"
@@ skipping 11 matching lines @@
   return ((options & mask) != 0);
 }
 
 }  // namespace
 
 SSLErrorUI::SSLErrorUI(const GURL& request_url,
                        int cert_error,
                        const net::SSLInfo& ssl_info,
                        int display_options,
                        const base::Time& time_triggered,
-                       const std::string& languages,
                        ControllerClient* controller)
     : request_url_(request_url),
       cert_error_(cert_error),
       ssl_info_(ssl_info),
       time_triggered_(time_triggered),
-      languages_(languages),
       requested_strict_enforcement_(
           IsMasked(display_options, STRICT_ENFORCEMENT)),
       soft_override_enabled_(IsMasked(display_options, SOFT_OVERRIDE_ENABLED)),
       hard_override_enabled_(
           !IsMasked(display_options, HARD_OVERRIDE_DISABLED)),
       controller_(controller),
       user_made_decision_(false) {
   controller_->metrics_helper()->RecordUserDecision(MetricsHelper::SHOW);
   controller_->metrics_helper()->RecordUserInteraction(
       MetricsHelper::TOTAL_VISITS);
@@ skipping 23 matching lines @@
   // Shared values for both the overridable and non-overridable versions.
   load_time_data->SetBoolean("bad_clock", false);
   load_time_data->SetString("tabTitle",
                             l10n_util::GetStringUTF16(IDS_SSL_V2_TITLE));
   load_time_data->SetString("heading",
                             l10n_util::GetStringUTF16(IDS_SSL_V2_HEADING));
   load_time_data->SetString(
       "primaryParagraph",
       l10n_util::GetStringFUTF16(
           IDS_SSL_V2_PRIMARY_PARAGRAPH,
-          common_string_util::GetFormattedHostName(request_url_, languages_)));
+          common_string_util::GetFormattedHostName(request_url_)));
 
   if (soft_override_enabled_)
     PopulateOverridableStrings(load_time_data);
   else
     PopulateNonOverridableStrings(load_time_data);
 }
 
 void SSLErrorUI::PopulateOverridableStrings(
     base::DictionaryValue* load_time_data) {
   DCHECK(soft_override_enabled_);
 
-  base::string16 url(
-      common_string_util::GetFormattedHostName(request_url_, languages_));
+  base::string16 url(common_string_util::GetFormattedHostName(request_url_));
   ssl_errors::ErrorInfo error_info = ssl_errors::ErrorInfo::CreateError(
       ssl_errors::ErrorInfo::NetErrorToErrorType(cert_error_),
       ssl_info_.cert.get(), request_url_);
 
   load_time_data->SetBoolean("overridable", true);
   load_time_data->SetString("explanationParagraph", error_info.details());
   load_time_data->SetString(
       "primaryButtonText",
       l10n_util::GetStringUTF16(IDS_SSL_OVERRIDABLE_SAFETY_BUTTON));
   load_time_data->SetString(
       "finalParagraph",
       l10n_util::GetStringFUTF16(IDS_SSL_OVERRIDABLE_PROCEED_PARAGRAPH, url));
 }
 
 void SSLErrorUI::PopulateNonOverridableStrings(
     base::DictionaryValue* load_time_data) {
   DCHECK(!soft_override_enabled_);
 
-  base::string16 url(
-      common_string_util::GetFormattedHostName(request_url_, languages_));
+  base::string16 url(common_string_util::GetFormattedHostName(request_url_));
   ssl_errors::ErrorInfo::ErrorType type =
       ssl_errors::ErrorInfo::NetErrorToErrorType(cert_error_);
 
   load_time_data->SetBoolean("overridable", false);
   load_time_data->SetString(
       "explanationParagraph",
       l10n_util::GetStringFUTF16(IDS_SSL_NONOVERRIDABLE_MORE, url));
   load_time_data->SetString("primaryButtonText",
                             l10n_util::GetStringUTF16(IDS_SSL_RELOAD));
 
@@ skipping 67 matching lines @@
       NOTREACHED() << "Unsupported command: " << command;
     case CMD_ERROR:
     case CMD_TEXT_FOUND:
     case CMD_TEXT_NOT_FOUND:
       // Commands are for testing.
       break;
   }
 }
 
 }  // security_interstitials