Clean up the PermissionInfoBarDelegate hierarchy.

chrome/browser/permissions/permission_infobar_delegate.h

Index: chrome/browser/permissions/permission_infobar_delegate.h
diff --git a/chrome/browser/permissions/permission_infobar_delegate.h b/chrome/browser/permissions/permission_infobar_delegate.h
index 53dd55aa18248006a181ac614a222328a10293c8..1156bb8afeeb05dca2ed1af52ff039b09902aedf 100644
--- a/chrome/browser/permissions/permission_infobar_delegate.h
+++ b/chrome/browser/permissions/permission_infobar_delegate.h
@@ -14,19 +14,18 @@
 #include "components/infobars/core/confirm_infobar_delegate.h"
 #include "content/public/browser/permission_type.h"
 
-class NavigationDetails;
 class Profile;
 
 // Base class for permission infobars, it implements the default behavior
 // so that the accept/deny buttons grant/deny the relevant permission.
 // A basic implementor only needs to implement the methods that
 // provide an icon and a message text to the infobar.
-class PermissionInfobarDelegate : public ConfirmInfoBarDelegate {
+class PermissionInfoBarDelegate : public ConfirmInfoBarDelegate {
 
  public:
   using PermissionSetCallback = base::Callback<void(bool, PermissionAction)>;
 
-  ~PermissionInfobarDelegate() override;
+  ~PermissionInfoBarDelegate() override;
   ContentSettingsType content_setting() const { return content_settings_type_; }
 
   // Returns true if the infobar should display a toggle to allow users to
@@ -41,24 +40,23 @@ class PermissionInfobarDelegate : public ConfirmInfoBarDelegate {
   base::string16 GetMessageText() const override;
 
  protected:
-  PermissionInfobarDelegate(const GURL& requesting_origin,
+  PermissionInfoBarDelegate(const GURL& requesting_origin,
                             content::PermissionType permission_type,
                             ContentSettingsType content_settings_type,
                             bool user_gesture,
                             Profile* profile,
                             const PermissionSetCallback& callback);
 
-  virtual int GetMessageResourceId() const = 0;
-
  private:
   // ConfirmInfoBarDelegate:
   Type GetInfoBarType() const override;
   void InfoBarDismissed() override;
-  PermissionInfobarDelegate* AsPermissionInfobarDelegate() override;
+  PermissionInfoBarDelegate* AsPermissionInfoBarDelegate() override;
   base::string16 GetButtonLabel(InfoBarButton button) const override;
   bool Accept() override;
   bool Cancel() override;
 
+  virtual int GetMessageResourceId() const = 0;
   void SetPermission(bool update_content_setting, PermissionAction decision);
 
   GURL requesting_origin_;
@@ -70,11 +68,11 @@ class PermissionInfobarDelegate : public ConfirmInfoBarDelegate {
   bool user_gesture_;
   bool persist_;
 
-  DISALLOW_COPY_AND_ASSIGN(PermissionInfobarDelegate);
+  DISALLOW_COPY_AND_ASSIGN(PermissionInfoBarDelegate);
 };
 
 // Implemented in platform-specific code.
 std::unique_ptr<infobars::InfoBar> CreatePermissionInfoBar(
-    std::unique_ptr<PermissionInfobarDelegate> delegate);
+    std::unique_ptr<PermissionInfoBarDelegate> delegate);
 
 #endif  // CHROME_BROWSER_PERMISSIONS_PERMISSION_INFOBAR_DELEGATE_H_