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

chrome/browser/permissions/permission_queue_controller.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/permissions/permission_queue_controller.h"
 
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/content_settings/host_content_settings_map_factory.h"
 #include "chrome/browser/geolocation/geolocation_infobar_delegate_android.h"
 #include "chrome/browser/infobars/infobar_service.h"
 #include "chrome/browser/media/midi_permission_infobar_delegate_android.h"
 #include "chrome/browser/media/protected_media_identifier_infobar_delegate_android.h"
 #include "chrome/browser/notifications/notification_permission_infobar_delegate.h"
 #include "chrome/browser/permissions/permission_request_id.h"
 #include "chrome/browser/permissions/permission_uma_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/tab_contents/tab_util.h"
-#include "chrome/common/pref_names.h"
 #include "components/content_settings/core/browser/host_content_settings_map.h"
 #include "components/content_settings/core/common/content_settings.h"
 #include "components/infobars/core/infobar.h"
-#include "components/prefs/pref_service.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/url_constants.h"
 
 namespace {
 
 InfoBarService* GetInfoBarService(const PermissionRequestID& id) {
@@ skipping 26 matching lines @@
 
   bool IsForPair(const GURL& requesting_frame,
                  const GURL& embedder) const;
 
   const PermissionRequestID& id() const { return id_; }
   const GURL& requesting_frame() const { return requesting_frame_; }
   bool has_infobar() const { return !!infobar_; }
   infobars::InfoBar* infobar() { return infobar_; }
 
   void RunCallback(ContentSetting content_setting);
-  void CreateInfoBar(PermissionQueueController* controller,
-                     const std::string& display_languages);
+  void CreateInfoBar(PermissionQueueController* controller);
 
  private:
   content::PermissionType type_;
   PermissionRequestID id_;
   GURL requesting_frame_;
   GURL embedder_;
   PermissionDecidedCallback callback_;
   infobars::InfoBar* infobar_;
 
   // Purposefully do not disable copying, as this is stored in STL containers.
@@ skipping 20 matching lines @@
     const GURL& embedder) const {
   return (requesting_frame_ == requesting_frame) && (embedder_ == embedder);
 }
 
 void PermissionQueueController::PendingInfobarRequest::RunCallback(
     ContentSetting content_setting) {
   callback_.Run(content_setting);
 }
 
 void PermissionQueueController::PendingInfobarRequest::CreateInfoBar(
-    PermissionQueueController* controller,
-    const std::string& display_languages) {
+    PermissionQueueController* controller) {
   // Controller can be Unretained because the lifetime of the infobar
   // is tied to that of the queue controller. Before QueueController
   // is destroyed, all requests will be cancelled and so all delegates
   // will be destroyed.
   PermissionInfobarDelegate::PermissionSetCallback callback =
       base::Bind(&PermissionQueueController::OnPermissionSet,
                  base::Unretained(controller),
                  id_,
                  requesting_frame_,
                  embedder_);
   switch (type_) {
     case content::PermissionType::GEOLOCATION:
       infobar_ = GeolocationInfoBarDelegateAndroid::Create(
-          GetInfoBarService(id_), requesting_frame_, display_languages,
-          callback);
+          GetInfoBarService(id_), requesting_frame_, callback);
       break;
 #if defined(ENABLE_NOTIFICATIONS)
     case content::PermissionType::NOTIFICATIONS:
       infobar_ = NotificationPermissionInfobarDelegate::Create(
-          GetInfoBarService(id_), requesting_frame_,
-          display_languages, callback);
+          GetInfoBarService(id_), requesting_frame_, callback);
       break;
 #endif  // ENABLE_NOTIFICATIONS
     case content::PermissionType::MIDI_SYSEX:
       infobar_ = MidiPermissionInfoBarDelegateAndroid::Create(
-          GetInfoBarService(id_), requesting_frame_, display_languages,
-          callback);
+          GetInfoBarService(id_), requesting_frame_, callback);
       break;
     case content::PermissionType::PROTECTED_MEDIA_IDENTIFIER:
       infobar_ = ProtectedMediaIdentifierInfoBarDelegateAndroid::Create(
-          GetInfoBarService(id_), requesting_frame_, display_languages,
-          callback);
+          GetInfoBarService(id_), requesting_frame_, callback);
       break;
     default:
       NOTREACHED();
       break;
   }
 }
 
 PermissionQueueController::PermissionQueueController(
     Profile* profile,
     content::PermissionType permission_type,
@@ skipping 173 matching lines @@
   InfoBarService* infobar_service = GetInfoBarService(id);
   if (!infobar_service || in_shutdown_) {
     ClearPendingInfobarRequestsForTab(id);
     return;
   }
 
   for (PendingInfobarRequests::iterator i = pending_infobar_requests_.begin();
        i != pending_infobar_requests_.end(); ++i) {
     if (ArePermissionRequestsForSameTab(i->id(), id) && !i->has_infobar()) {
       RegisterForInfoBarNotifications(infobar_service);
-      i->CreateInfoBar(
-          this, profile_->GetPrefs()->GetString(prefs::kAcceptLanguages));
+      i->CreateInfoBar(this);
       return;
     }
   }
 
   UnregisterForInfoBarNotifications(infobar_service);
 }
 
 void PermissionQueueController::ClearPendingInfobarRequestsForTab(
     const PermissionRequestID& id) {
   for (PendingInfobarRequests::iterator i = pending_infobar_requests_.begin();
@@ skipping 41 matching lines @@
   }
 
   ContentSetting content_setting =
       allowed ? CONTENT_SETTING_ALLOW : CONTENT_SETTING_BLOCK;
 
   HostContentSettingsMapFactory::GetForProfile(profile_)
       ->SetContentSettingDefaultScope(
           requesting_frame.GetOrigin(), embedder.GetOrigin(),
           content_settings_type_, std::string(), content_setting);
 }