Add initial support for runtime permissions in android M.

chrome/browser/content_settings/permission_infobar_delegate.h

Index: chrome/browser/content_settings/permission_infobar_delegate.h
diff --git a/chrome/browser/content_settings/permission_infobar_delegate.h b/chrome/browser/content_settings/permission_infobar_delegate.h
index 2f238b89832a4bd06061ba8b7608446bc2979c10..5a7b1f0d44976e3e3617900712798dcbdad4a851 100644
--- a/chrome/browser/content_settings/permission_infobar_delegate.h
+++ b/chrome/browser/content_settings/permission_infobar_delegate.h
@@ -20,6 +20,9 @@ class PermissionQueueController;
 // provide an icon and a message text to the infobar.
 class PermissionInfobarDelegate : public ConfirmInfoBarDelegate {
 
+ public:
+  ContentSettingsType content_setting() { return type_; }

[Peter Kasting, 2015/06/04 07:08:13]

Nit: const

[Ted C, 2015/06/05 00:57:57]

Done.

+
  protected:
   PermissionInfobarDelegate(PermissionQueueController* controller,
                             const PermissionRequestID& id,
@@ -34,6 +37,7 @@ class PermissionInfobarDelegate : public ConfirmInfoBarDelegate {
   base::string16 GetButtonLabel(InfoBarButton button) const override;
   bool Accept() override;
   bool Cancel() override;
+  PermissionInfobarDelegate* AsPermissionInfobarDelegate() override;

[Peter Kasting, 2015/06/04 07:08:13]

Nit: This belongs right after InfoBarDismissed() to match its order in the base
class header files.

[Ted C, 2015/06/05 00:57:57]

Done.  Re-ordered cc to match

 
   void SetPermission(bool update_content_setting, bool allowed);