permissions: switch from explicitly passing queue controller to callbacks

chrome/browser/media/protected_media_identifier_infobar_delegate.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/media/protected_media_identifier_infobar_delegate.h"
 
 #include "chrome/browser/infobars/infobar_service.h"
-#include "chrome/browser/permissions/permission_queue_controller.h"
 #include "chrome/browser/permissions/permission_request_id.h"

[mlamouri (slow - plz ping), 2015/09/15 17:26:42]

nit: remove this include.

 #include "chrome/common/url_constants.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/infobars/core/infobar.h"
 #include "components/url_formatter/url_formatter.h"
 #include "grit/components_strings.h"
 #include "grit/theme_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
 // static
 infobars::InfoBar* ProtectedMediaIdentifierInfoBarDelegate::Create(
     InfoBarService* infobar_service,
-    PermissionQueueController* controller,
-    const PermissionRequestID& id,
     const GURL& requesting_frame,
-    const std::string& display_languages) {
+    const std::string& display_languages,
+    const PermissionSetCallback& callback) {
   return infobar_service->AddInfoBar(infobar_service->CreateConfirmInfoBar(
       scoped_ptr<ConfirmInfoBarDelegate>(
           new ProtectedMediaIdentifierInfoBarDelegate(
-              controller, id, requesting_frame, display_languages))));
+              requesting_frame, display_languages, callback))));
 }
 
 ProtectedMediaIdentifierInfoBarDelegate::
     ProtectedMediaIdentifierInfoBarDelegate(
-    PermissionQueueController* controller,
-    const PermissionRequestID& id,
     const GURL& requesting_frame,
-    const std::string& display_languages)
+    const std::string& display_languages,
+    const PermissionSetCallback& callback)
     : PermissionInfobarDelegate(
-          controller, id, requesting_frame,
-          CONTENT_SETTINGS_TYPE_PROTECTED_MEDIA_IDENTIFIER),
+          requesting_frame,
+          CONTENT_SETTINGS_TYPE_PROTECTED_MEDIA_IDENTIFIER,
+          callback),
       requesting_frame_(requesting_frame),
       display_languages_(display_languages) {
 }
 
 ProtectedMediaIdentifierInfoBarDelegate::
     ~ProtectedMediaIdentifierInfoBarDelegate() {
 }
 
 int ProtectedMediaIdentifierInfoBarDelegate::GetIconId() const {
   return IDR_INFOBAR_PROTECTED_MEDIA_IDENTIFIER;
@@ skipping 13 matching lines @@
 bool ProtectedMediaIdentifierInfoBarDelegate::LinkClicked(
     WindowOpenDisposition disposition) {
   InfoBarService::WebContentsFromInfoBar(infobar())
       ->OpenURL(content::OpenURLParams(
           GURL(chrome::kEnhancedPlaybackNotificationLearnMoreURL),
           content::Referrer(),
           (disposition == CURRENT_TAB) ? NEW_FOREGROUND_TAB : disposition,
           ui::PAGE_TRANSITION_LINK, false));
   return false; // Do not dismiss the info bar.
 }