Replace PermissionType in chrome/ with ContentSettingsType

chrome/browser/permissions/permission_blacklist_client.cc

Index: chrome/browser/permissions/permission_blacklist_client.cc
diff --git a/chrome/browser/permissions/permission_blacklist_client.cc b/chrome/browser/permissions/permission_blacklist_client.cc
index 35386710372b2842c755bd22e604cb199e0ec88e..b0db67826c6f2d9d0fc69f8d97f46a5d509093b7 100644
--- a/chrome/browser/permissions/permission_blacklist_client.cc
+++ b/chrome/browser/permissions/permission_blacklist_client.cc
@@ -17,27 +17,28 @@
 // static
 void PermissionBlacklistClient::CheckSafeBrowsingBlacklist(
     scoped_refptr<safe_browsing::SafeBrowsingDatabaseManager> db_manager,
-    content::PermissionType permission_type,
+    ContentSettingsType content_settings_type,
     const GURL& request_origin,
     content::WebContents* web_contents,
     int timeout,
     base::Callback<void(bool)> callback) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
 
-  new PermissionBlacklistClient(db_manager, permission_type, request_origin,
-                                web_contents, timeout, callback);
+  new PermissionBlacklistClient(db_manager, content_settings_type,
+                                request_origin, web_contents, timeout,
+                                callback);
 }
 
 PermissionBlacklistClient::PermissionBlacklistClient(
     scoped_refptr<safe_browsing::SafeBrowsingDatabaseManager> db_manager,
-    content::PermissionType permission_type,
+    ContentSettingsType content_settings_type,
     const GURL& request_origin,
     content::WebContents* web_contents,
     int timeout,
     base::Callback<void(bool)> callback)
     : content::WebContentsObserver(web_contents),
       db_manager_(db_manager),
-      permission_type_(permission_type),
+      content_settings_type_(content_settings_type),
       callback_(callback),
       timeout_(timeout),
       is_active_(true) {
@@ -79,8 +80,8 @@ void PermissionBlacklistClient::OnCheckApiBlacklistUrlResult(
 
   bool permission_blocked =
       metadata.api_permissions.find(
-          PermissionUtil::ConvertPermissionTypeToSafeBrowsingName(
-              permission_type_)) != metadata.api_permissions.end();
+          PermissionUtil::ConvertContentSettingsTypeToSafeBrowsingName(
+              content_settings_type_)) != metadata.api_permissions.end();
 
   content::BrowserThread::PostTask(
       content::BrowserThread::UI, FROM_HERE,