Replace PermissionType in chrome/ with ContentSettingsType

chrome/browser/permissions/permission_blacklist_client.cc

 // Copyright 2017 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.
 
 #include "chrome/browser/permissions/permission_blacklist_client.h"
 
 #include <set>
 #include <string>
 
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
 #include "base/timer/elapsed_timer.h"
 #include "base/timer/timer.h"
 #include "chrome/browser/permissions/permission_uma_util.h"
 #include "chrome/browser/permissions/permission_util.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/web_contents.h"
 #include "url/gurl.h"
 
 // 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) {
   // Balanced by a call to Release() in EvaluateBlacklistResultOnUiThread().
   AddRef();
   content::BrowserThread::PostTask(
       content::BrowserThread::IO, FROM_HERE,
       base::Bind(&PermissionBlacklistClient::StartCheck, this, request_origin));
 }
 
@@ skipping 28 matching lines @@
   if (timer_->IsRunning()) {
     timer_->Stop();
   } else {
     db_manager_->CancelApiCheck(this);
     response = SafeBrowsingResponse::TIMEOUT;
   }
 
   timer_.reset(nullptr);
   bool permission_blocked =
       metadata.api_permissions.find(
-          PermissionUtil::ConvertPermissionTypeToSafeBrowsingName(
-              permission_type_)) != metadata.api_permissions.end();
+          PermissionUtil::ConvertContentSettingsTypeToSafeBrowsingName(
+              content_settings_type_)) != metadata.api_permissions.end();
   if (permission_blocked)
     response = SafeBrowsingResponse::BLACKLISTED;
 
   PermissionUmaUtil::RecordSafeBrowsingResponse(response_time, response);
   content::BrowserThread::PostTask(
       content::BrowserThread::UI, FROM_HERE,
       base::Bind(&PermissionBlacklistClient::EvaluateBlacklistResultOnUiThread,
                  this, permission_blocked));
 }
 
 void PermissionBlacklistClient::EvaluateBlacklistResultOnUiThread(
     bool response) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
 
   if (is_active_)
     callback_.Run(response);
   Release();
 }
 
 void PermissionBlacklistClient::WebContentsDestroyed() {
   is_active_ = false;
   Observe(nullptr);
 }