permissions: remove PermissionQueueController and introduce PermissionInfoBarManager

chrome/browser/permissions/permission_context_base.h

Index: chrome/browser/permissions/permission_context_base.h
diff --git a/chrome/browser/permissions/permission_context_base.h b/chrome/browser/permissions/permission_context_base.h
index 6c084e179c48da4dae0045acb35b18fed494336c..782f13536c95062776d3fab11a252087d10682e0 100644
--- a/chrome/browser/permissions/permission_context_base.h
+++ b/chrome/browser/permissions/permission_context_base.h
@@ -113,11 +113,6 @@ class PermissionContextBase : public KeyedService {
                                 const GURL& requesting_origin,
                                 bool allowed) {}
 
-#if defined(OS_ANDROID)
-  // Return an instance of the infobar queue controller, creating it if needed.
-  PermissionQueueController* GetQueueController();
-#endif
-
   // Returns the profile associated with this permission context.
   Profile* profile() const;
 
@@ -137,9 +132,6 @@ class PermissionContextBase : public KeyedService {
 
   Profile* profile_;
   const ContentSettingsType permission_type_;
-#if defined(OS_ANDROID)
-  scoped_ptr<PermissionQueueController> permission_queue_controller_;
-#endif
   base::ScopedPtrHashMap<std::string, scoped_ptr<PermissionBubbleRequest>>
       pending_bubbles_;