permissions: switch from explicitly passing queue controller to callbacks

chrome/browser/media/protected_media_identifier_infobar_delegate.h

Index: chrome/browser/media/protected_media_identifier_infobar_delegate.h
diff --git a/chrome/browser/media/protected_media_identifier_infobar_delegate.h b/chrome/browser/media/protected_media_identifier_infobar_delegate.h
index 6eee305448dedf508f7db34278e6ebb4f1198c6b..8a89384805d590d5dfa1e6ea1513a98f67cf0199 100644
--- a/chrome/browser/media/protected_media_identifier_infobar_delegate.h
+++ b/chrome/browser/media/protected_media_identifier_infobar_delegate.h
@@ -7,11 +7,11 @@
 
 #include <string>
 
+#include "base/callback.h"

[mlamouri (slow - plz ping), 2015/09/15 12:55:59]

Use callback_forward.h

[Lalit Maganti, 2015/09/15 13:16:53]

ATM I can't because I store a callback but if I do add the subclassing of
PermissionInfobarDelegate then I could do this I guess.

[Lalit Maganti, 2015/09/15 14:19:24]

Done.

 #include "chrome/browser/permissions/permission_request_id.h"
 #include "components/infobars/core/confirm_infobar_delegate.h"
 #include "url/gurl.h"
 
-class PermissionQueueController;
 class InfoBarService;
 
 // TODO(toyoshim): Much more code can be shared with GeolocationInfoBarDelegate.
@@ -22,17 +22,19 @@ class ProtectedMediaIdentifierInfoBarDelegate : public ConfirmInfoBarDelegate {
   // Creates a protected media identifier infobar and delegate and adds the
   // infobar to |infobar_service|.  Returns the infobar if it was successfully
   // added.
-  static infobars::InfoBar* Create(InfoBarService* infobar_service,
-                                   PermissionQueueController* controller,
-                                   const PermissionRequestID& id,
-                                   const GURL& requesting_frame,
-                                   const std::string& display_languages);
+  static infobars::InfoBar* Create(
+    InfoBarService* infobar_service,
+    const PermissionRequestID& id,
+    const GURL& requesting_frame,
+    const std::string& display_languages,
+    const base::Callback<void(bool, bool)>& callback);
 
  protected:
-  ProtectedMediaIdentifierInfoBarDelegate(PermissionQueueController* controller,
-                                          const PermissionRequestID& id,
-                                          const GURL& requesting_frame,
-                                          const std::string& display_languages);
+  ProtectedMediaIdentifierInfoBarDelegate(
+      const PermissionRequestID& id,
+      const GURL& requesting_frame,
+      const std::string& display_languages,
+      const base::Callback<void(bool, bool)>& callback);
   ~ProtectedMediaIdentifierInfoBarDelegate() override;
 
   // Calls back to the controller to inform it of the user's decision.
@@ -50,10 +52,10 @@ class ProtectedMediaIdentifierInfoBarDelegate : public ConfirmInfoBarDelegate {
   base::string16 GetLinkText() const override;
   bool LinkClicked(WindowOpenDisposition disposition) override;
 
-  PermissionQueueController* controller_;
   const PermissionRequestID id_;
   GURL requesting_frame_;
   std::string display_languages_;
+  const base::Callback<void(bool, bool)> callback_;
 
   DISALLOW_COPY_AND_ASSIGN(ProtectedMediaIdentifierInfoBarDelegate);
 };