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

components/app_modal/javascript_dialog_manager.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/app_modal/javascript_dialog_manager.h"
 
 #include <algorithm>
 #include <utility>
 
 #include "base/bind.h"
@@ skipping 83 matching lines @@
 JavaScriptDialogManager::JavaScriptDialogManager()
     : extensions_client_(new DefaultExtensionsClient) {
 }
 
 JavaScriptDialogManager::~JavaScriptDialogManager() {
 }
 
 void JavaScriptDialogManager::RunJavaScriptDialog(
     content::WebContents* web_contents,
     const GURL& origin_url,
-    const std::string& accept_lang,
     content::JavaScriptMessageType message_type,
     const base::string16& message_text,
     const base::string16& default_prompt_text,
     const DialogClosedCallback& callback,
     bool* did_suppress_message)  {
   *did_suppress_message = false;
 
   ChromeJavaScriptDialogExtraData* extra_data =
       &javascript_dialog_extra_data_[web_contents];
 
@@ skipping 30 matching lines @@
   // Also log the time since a dialog was closed, but only if this is the first
   // dialog that was opened since the closing.
   if (!last_close_time_.is_null()) {
     UMA_HISTOGRAM_MEDIUM_TIMES(
         "JSDialogs.FineTiming.TimeBetweenDialogClosedAndNextDialogCreated",
         now - last_close_time_);
     last_close_time_ = base::TimeTicks();
   }
 
   bool is_alert = message_type == content::JAVASCRIPT_MESSAGE_TYPE_ALERT;
-  base::string16 dialog_title =
-      GetTitle(web_contents, origin_url, accept_lang, is_alert);
+  base::string16 dialog_title = GetTitle(web_contents, origin_url, is_alert);
 
   extensions_client_->OnDialogOpened(web_contents);
 
   LogUMAMessageLengthStats(message_text);
   AppModalDialogQueue::GetInstance()->AddDialog(new JavaScriptAppModalDialog(
       web_contents,
       &javascript_dialog_extra_data_,
       dialog_title,
       message_type,
       message_text,
@@ skipping 78 matching lines @@
 
 void JavaScriptDialogManager::ResetDialogState(
     content::WebContents* web_contents) {
   CancelActiveAndPendingDialogs(web_contents);
   javascript_dialog_extra_data_.erase(web_contents);
 }
 
 base::string16 JavaScriptDialogManager::GetTitle(
     content::WebContents* web_contents,
     const GURL& origin_url,
-    const std::string& accept_lang,
     bool is_alert) {
   // For extensions, show the extension name, but only if the origin of
   // the alert matches the top-level WebContents.
   std::string name;
   if (extensions_client_->GetExtensionName(web_contents, origin_url, &name))
     return base::UTF8ToUTF16(name);
 
   // Otherwise, return the formatted URL. For non-standard URLs such as |data:|,
   // just say "This page".
   bool is_same_origin_as_main_frame =
       (web_contents->GetURL().GetOrigin() == origin_url.GetOrigin());
   if (origin_url.IsStandard() && !origin_url.SchemeIsFile() &&
       !origin_url.SchemeIsFileSystem()) {
 #if !defined(OS_ANDROID)
     base::string16 url_string =
         url_formatter::ElideHost(origin_url, gfx::FontList(), kUrlElideWidth);
 #else
     base::string16 url_string =
-        url_formatter::FormatUrlForSecurityDisplayOmitScheme(origin_url,
-                                                             accept_lang);
+        url_formatter::FormatUrlForSecurityDisplayOmitScheme(origin_url);
 #endif
     return l10n_util::GetStringFUTF16(
         is_same_origin_as_main_frame ? IDS_JAVASCRIPT_MESSAGEBOX_TITLE
                                      : IDS_JAVASCRIPT_MESSAGEBOX_TITLE_IFRAME,
         base::i18n::GetDisplayStringInLTRDirectionality(url_string));
   }
   return l10n_util::GetStringUTF16(
       is_same_origin_as_main_frame
           ? IDS_JAVASCRIPT_MESSAGEBOX_TITLE_NONSTANDARD_URL
           : IDS_JAVASCRIPT_MESSAGEBOX_TITLE_NONSTANDARD_URL_IFRAME);
@@ skipping 43 matching lines @@
   // lazy background page after the dialog closes. (Dialogs are closed before
   // their WebContents is destroyed so |web_contents| is still valid here.)
   extensions_client_->OnDialogClosed(web_contents);
 
   last_close_time_ = base::TimeTicks::Now();
 
   callback.Run(success, user_input);
 }
 
 }  // namespace app_modal