Clean up the PermissionInfoBarDelegate hierarchy.

chrome/browser/permissions/permission_queue_controller.cc

Index: chrome/browser/permissions/permission_queue_controller.cc
diff --git a/chrome/browser/permissions/permission_queue_controller.cc b/chrome/browser/permissions/permission_queue_controller.cc
index caa45c101fcca4d2dad1af5cac51f553a9c36c0d..4825cca9d1e9e4cd243ed95a44248941fe7f22b4 100644
--- a/chrome/browser/permissions/permission_queue_controller.cc
+++ b/chrome/browser/permissions/permission_queue_controller.cc
@@ -11,6 +11,7 @@
 #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_infobar_delegate.h"
 #include "chrome/browser/permissions/permission_request.h"
 #include "chrome/browser/permissions/permission_request_id.h"
 #include "chrome/browser/permissions/permission_uma_util.h"
@@ -119,7 +120,7 @@ void PermissionQueueController::PendingInfobarRequest::CreateInfoBar(
   // 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(
+  PermissionInfoBarDelegate::PermissionSetCallback callback = base::Bind(
       &PermissionQueueController::OnPermissionSet, base::Unretained(controller),
       id_, requesting_frame_, embedder_, user_gesture_);
   switch (type_) {
@@ -130,7 +131,7 @@ void PermissionQueueController::PendingInfobarRequest::CreateInfoBar(
       break;
 #if defined(ENABLE_NOTIFICATIONS)
     case content::PermissionType::NOTIFICATIONS:
-      infobar_ = NotificationPermissionInfobarDelegate::Create(
+      infobar_ = NotificationPermissionInfoBarDelegate::Create(
           GetInfoBarService(id_), requesting_frame_, user_gesture_, profile_,
           callback);
       break;