Replace PermissionType in chrome/ with ContentSettingsType

chrome/browser/permissions/permission_decision_auto_blocker.cc

Index: chrome/browser/permissions/permission_decision_auto_blocker.cc
diff --git a/chrome/browser/permissions/permission_decision_auto_blocker.cc b/chrome/browser/permissions/permission_decision_auto_blocker.cc
index 3f83a9137a03d62ab4a85ea27bbdc5fabcb6678b..21a2511cd1b25b96d79e9a8b25effa60aa5d1df2 100644
--- a/chrome/browser/permissions/permission_decision_auto_blocker.cc
+++ b/chrome/browser/permissions/permission_decision_auto_blocker.cc
@@ -23,7 +23,6 @@
 #include "components/keyed_service/content/browser_context_dependency_manager.h"
 #include "components/safe_browsing_db/database_manager.h"
 #include "components/variations/variations_associated_data.h"
-#include "content/public/browser/permission_type.h"
 #include "content/public/browser/web_contents.h"
 #include "url/gurl.h"
 
@@ -75,7 +74,7 @@ base::DictionaryValue* GetOrCreatePermissionDict(
 }
 
 int RecordActionInWebsiteSettings(const GURL& url,
-                                  content::PermissionType permission,
+                                  ContentSettingsType permission,
                                   const char* key,
                                   Profile* profile) {
   HostContentSettingsMap* map =
@@ -97,7 +96,7 @@ int RecordActionInWebsiteSettings(const GURL& url,
 }
 
 int GetActionCount(const GURL& url,
-                   content::PermissionType permission,
+                   ContentSettingsType permission,
                    const char* key,
                    Profile* profile) {
   HostContentSettingsMap* map =
@@ -207,19 +206,19 @@ void PermissionDecisionAutoBlocker::RemoveCountsByUrl(
 
 int PermissionDecisionAutoBlocker::GetDismissCount(
     const GURL& url,
-    content::PermissionType permission) {
+    ContentSettingsType permission) {
   return GetActionCount(url, permission, kPromptDismissCountKey, profile_);
 }
 
 int PermissionDecisionAutoBlocker::GetIgnoreCount(
     const GURL& url,
-    content::PermissionType permission) {
+    ContentSettingsType permission) {
   return GetActionCount(url, permission, kPromptIgnoreCountKey, profile_);
 }
 
 bool PermissionDecisionAutoBlocker::RecordDismissAndEmbargo(
     const GURL& url,
-    content::PermissionType permission) {
+    ContentSettingsType permission) {
   int current_dismissal_count = RecordActionInWebsiteSettings(
       url, permission, kPromptDismissCountKey, profile_);
 
@@ -233,7 +232,7 @@ bool PermissionDecisionAutoBlocker::RecordDismissAndEmbargo(
 
 int PermissionDecisionAutoBlocker::RecordIgnore(
     const GURL& url,
-    content::PermissionType permission) {
+    ContentSettingsType permission) {
   return RecordActionInWebsiteSettings(url, permission, kPromptIgnoreCountKey,
                                        profile_);
 }
@@ -268,7 +267,7 @@ void PermissionDecisionAutoBlocker::UpdateFromVariations() {
 }
 
 void PermissionDecisionAutoBlocker::UpdateEmbargoedStatus(
-    content::PermissionType permission,
+    ContentSettingsType permission,
     const GURL& request_origin,
     content::WebContents* web_contents,
     base::Callback<void(bool)> callback) {
@@ -296,7 +295,7 @@ void PermissionDecisionAutoBlocker::UpdateEmbargoedStatus(
 }
 
 bool PermissionDecisionAutoBlocker::IsUnderEmbargo(
-    content::PermissionType permission,
+    ContentSettingsType permission,
     const GURL& request_origin) {
   HostContentSettingsMap* map =
       HostContentSettingsMapFactory::GetForProfile(profile_);
@@ -333,7 +332,7 @@ bool PermissionDecisionAutoBlocker::IsUnderEmbargo(
 }
 
 void PermissionDecisionAutoBlocker::CheckSafeBrowsingResult(
-    content::PermissionType permission,
+    ContentSettingsType permission,
     const GURL& request_origin,
     base::Callback<void(bool)> callback,
     bool should_be_embargoed) {
@@ -347,7 +346,7 @@ void PermissionDecisionAutoBlocker::CheckSafeBrowsingResult(
 }
 
 void PermissionDecisionAutoBlocker::PlaceUnderEmbargo(
-    content::PermissionType permission,
+    ContentSettingsType permission,
     const GURL& request_origin,
     const char* key) {
   HostContentSettingsMap* map =