Clean up the PermissionInfoBarDelegate hierarchy.

chrome/browser/permissions/permission_infobar_delegate.h

 // Copyright 2014 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.
 
 #ifndef CHROME_BROWSER_PERMISSIONS_PERMISSION_INFOBAR_DELEGATE_H_
 #define CHROME_BROWSER_PERMISSIONS_PERMISSION_INFOBAR_DELEGATE_H_
 
 #include <memory>
 
 #include "base/callback.h"
 #include "base/macros.h"
 #include "chrome/browser/permissions/permission_util.h"
 #include "components/content_settings/core/common/content_settings_types.h"
 #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
   // opt-out of persisting their accept/deny decision.
   bool ShouldShowPersistenceToggle() const;
 
   // Sets whether or not a decided permission should be persisted to content
   // settings.
   void set_persist(bool persist) { persist_ = persist; }
 
   // 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;
+  virtual int GetMessageResourceId() const = 0;

[Peter Kasting, 2016/08/17 23:02:22]

Nit: Don't place this in the middle of the ConfirmInfoBarDelegate overrides. 
Put it below that list.  (Then move the declaration and definition in
ProtectedMediaIdentifierInfoBarDelegateAndroid to the bottom of its list of
overrides as well, to match this order.)

[dominickn, 2016/08/17 23:29:41]

Done.

   bool Accept() override;
   bool Cancel() override;
 
   void SetPermission(bool update_content_setting, PermissionAction decision);
 
   GURL requesting_origin_;
   content::PermissionType permission_type_;
   ContentSettingsType content_settings_type_;
   Profile* const profile_;
   const PermissionSetCallback callback_;
   bool action_taken_;
   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_