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

chrome/browser/ui/webui/options/password_manager_handler.cc

 // Copyright 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/browser/ui/webui/options/password_manager_handler.h"
 
 #include "base/bind.h"
 #include "base/feature_list.h"
 #include "base/macros.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 39 matching lines @@
 const char kIsAndroidUriField[] = "isAndroidUri";
 const char kIsClickable[] = "isClickable";
 const char kIsSecureField[] = "isSecure";
 const char kUsernameField[] = "username";
 const char kPasswordField[] = "password";
 const char kFederationField[] = "federation";
 
 // Copies from |form| to |entry| the origin, shown origin, whether the origin is
 // Android URI, and whether the origin is secure.
 void CopyOriginInfoOfPasswordForm(const autofill::PasswordForm& form,
-                                  const std::string& languages,
                                   base::DictionaryValue* entry) {
   bool is_android_uri = false;
   bool origin_is_clickable = false;
   GURL link_url;
   entry->SetString(
       kShownOriginField,
       password_manager::GetShownOriginAndLinkUrl(
-          form, languages, &is_android_uri, &link_url, &origin_is_clickable));
+          form, &is_android_uri, &link_url, &origin_is_clickable));
   DCHECK(link_url.is_valid());
   entry->SetString(
       kUrlField, url_formatter::FormatUrl(
-                     link_url, languages, url_formatter::kFormatUrlOmitNothing,
+                     link_url, url_formatter::kFormatUrlOmitNothing,
                      net::UnescapeRule::SPACES, nullptr, nullptr, nullptr));
   entry->SetBoolean(kIsAndroidUriField, is_android_uri);
   entry->SetBoolean(kIsClickable, origin_is_clickable);
   entry->SetBoolean(kIsSecureField, content::IsOriginSecure(link_url));
 }
 
 }  // namespace
 
 PasswordManagerHandler::PasswordManagerHandler()
     : password_manager_presenter_(this) {}
@@ skipping 140 matching lines @@
 }
 
 void PasswordManagerHandler::HandleUpdatePasswordLists(
     const base::ListValue* args) {
   password_manager_presenter_.UpdatePasswordLists();
 }
 
 void PasswordManagerHandler::SetPasswordList(
     const std::vector<scoped_ptr<autofill::PasswordForm>>& password_list) {
   base::ListValue entries;
-  languages_ = GetProfile()->GetPrefs()->GetString(prefs::kAcceptLanguages);
   base::string16 placeholder(base::ASCIIToUTF16("        "));
   for (const auto& saved_password : password_list) {
     scoped_ptr<base::DictionaryValue> entry(new base::DictionaryValue);
-    CopyOriginInfoOfPasswordForm(*saved_password, languages_, entry.get());
+    CopyOriginInfoOfPasswordForm(*saved_password, entry.get());
 
     entry->SetString(kUsernameField, saved_password->username_value);
     // Use a placeholder value with the same length as the password.
     entry->SetString(
         kPasswordField,
         base::string16(saved_password->password_value.length(), ' '));
     if (!saved_password->federation_origin.unique()) {
       entry->SetString(
           kFederationField,
           l10n_util::GetStringFUTF16(
               IDS_PASSWORDS_VIA_FEDERATION,
               base::UTF8ToUTF16(saved_password->federation_origin.host())));
     }
 
     entries.Append(entry.release());
   }
 
   web_ui()->CallJavascriptFunction("PasswordManager.setSavedPasswordsList",
                                    entries);
 }
 
 void PasswordManagerHandler::SetPasswordExceptionList(
     const std::vector<scoped_ptr<autofill::PasswordForm>>&
         password_exception_list) {
   base::ListValue entries;
   for (const auto& exception : password_exception_list) {
     scoped_ptr<base::DictionaryValue> entry(new base::DictionaryValue);
-    CopyOriginInfoOfPasswordForm(*exception, languages_, entry.get());
+    CopyOriginInfoOfPasswordForm(*exception,  entry.get());
     entries.Append(entry.release());
   }
 
   web_ui()->CallJavascriptFunction("PasswordManager.setPasswordExceptionsList",
                                    entries);
 }
 
 }  // namespace options