Use PermissionType instead of ContentSettingsType in Android permission infobars

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 96e82c9396fedf16d176e66b2cd9657efe419fff..f51c5f114f794cf3d6d52a298f9b8a7b596126fb 100644
--- a/chrome/browser/permissions/permission_infobar_delegate.h
+++ b/chrome/browser/permissions/permission_infobar_delegate.h
@@ -11,7 +11,6 @@
 #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"
 
@@ -27,7 +26,7 @@ class PermissionInfoBarDelegate : public ConfirmInfoBarDelegate {
   using PermissionSetCallback = base::Callback<void(bool, PermissionAction)>;
 
   ~PermissionInfoBarDelegate() override;
-  virtual std::vector<int> content_settings() const;
+  virtual std::vector<int> permission_types() const;
 
   // Returns true if the infobar should display a toggle to allow users to
   // opt-out of persisting their accept/deny decision.
@@ -44,7 +43,6 @@ class PermissionInfoBarDelegate : public ConfirmInfoBarDelegate {
  protected:
   PermissionInfoBarDelegate(const GURL& requesting_origin,
                             content::PermissionType permission_type,
-                            ContentSettingsType content_settings_type,
                             bool user_gesture,
                             Profile* profile,
                             const PermissionSetCallback& callback);
@@ -63,7 +61,6 @@ class PermissionInfoBarDelegate : public ConfirmInfoBarDelegate {
 
   GURL requesting_origin_;
   content::PermissionType permission_type_;
-  ContentSettingsType content_settings_type_;
   Profile* const profile_;
   const PermissionSetCallback callback_;
   bool action_taken_;