permissions: switch from explicitly passing queue controller to callbacks

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 "base/prefs/pref_service.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/geolocation/geolocation_infobar_delegate.h"
 #include "chrome/browser/infobars/infobar_service.h"
 #include "chrome/browser/media/midi_permission_infobar_delegate.h"
 #include "chrome/browser/notifications/notification_permission_infobar_delegate.h"
 #include "chrome/browser/permissions/permission_context_uma_util.h"
+#include "chrome/browser/permissions/permission_request_id.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/storage/durable_storage_permission_infobar_delegate.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 "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_source.h"
@@ skipping 82 matching lines @@
 }
 
 void PermissionQueueController::PendingInfobarRequest::RunCallback(
     ContentSetting content_setting) {
   callback_.Run(content_setting);
 }
 
 void PermissionQueueController::PendingInfobarRequest::CreateInfoBar(
     PermissionQueueController* controller,
     const std::string& display_languages) {
+  // 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_SETTINGS_TYPE_GEOLOCATION:
       infobar_ = GeolocationInfoBarDelegate::Create(
-          GetInfoBarService(id_), controller, id_, requesting_frame_,
-          display_languages);
+          GetInfoBarService(id_), requesting_frame_,
+          display_languages, callback);
       break;
 #if defined(ENABLE_NOTIFICATIONS)
     case CONTENT_SETTINGS_TYPE_NOTIFICATIONS:
       infobar_ = NotificationPermissionInfobarDelegate::Create(
-          GetInfoBarService(id_), controller, id_, requesting_frame_,
-          display_languages);
+          GetInfoBarService(id_), requesting_frame_,
+          display_languages, callback);
       break;
 #endif  // ENABLE_NOTIFICATIONS
     case CONTENT_SETTINGS_TYPE_MIDI_SYSEX:
       infobar_ = MidiPermissionInfoBarDelegate::Create(
-          GetInfoBarService(id_), controller, id_, requesting_frame_,
-          display_languages, type_);
+          GetInfoBarService(id_), requesting_frame_,
+          display_languages, type_, callback);
       break;
 #if defined(OS_ANDROID) || defined(OS_CHROMEOS)
     case CONTENT_SETTINGS_TYPE_PROTECTED_MEDIA_IDENTIFIER:
       infobar_ = ProtectedMediaIdentifierInfoBarDelegate::Create(
-          GetInfoBarService(id_), controller, id_, requesting_frame_,
-          display_languages);
+          GetInfoBarService(id_), requesting_frame_,
+          display_languages, callback);
       break;
 #endif
     case CONTENT_SETTINGS_TYPE_DURABLE_STORAGE:
       infobar_ = DurableStoragePermissionInfoBarDelegate::Create(
-          GetInfoBarService(id_), controller, id_, requesting_frame_,
-          display_languages, type_);
+          GetInfoBarService(id_), requesting_frame_,
+          display_languages, type_, callback);
       break;
     default:
       NOTREACHED();
       break;
   }
 }
 
 
 PermissionQueueController::PermissionQueueController(Profile* profile,
                                                      ContentSettingsType type)
@@ skipping 242 matching lines @@
       ContentSettingsPattern::Wildcard() :
       ContentSettingsPattern::FromURLNoWildcard(embedder.GetOrigin());
 
   profile_->GetHostContentSettingsMap()->SetContentSetting(
       ContentSettingsPattern::FromURLNoWildcard(requesting_frame.GetOrigin()),
       embedder_pattern,
       type_,
       std::string(),
       content_setting);
 }