Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4804)

Unified Diff: chrome/browser/permissions/permission_context_base.h

Issue 2640033006: Convert AutoBlocker static class to KeyedService. (Closed)
Patch Set: Add clock, move browsing data tests, nits Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/permissions/permission_context_base.h
diff --git a/chrome/browser/permissions/permission_context_base.h b/chrome/browser/permissions/permission_context_base.h
index 733f561ad2147c614a82e8bfe910c75921414e78..5b94cccc80c2e9fff8869458eae3590544adcf6b 100644
--- a/chrome/browser/permissions/permission_context_base.h
+++ b/chrome/browser/permissions/permission_context_base.h
@@ -28,10 +28,6 @@ namespace content {
class WebContents;
}
-namespace safe_browsing {
-class SafeBrowsingDatabaseManager;
-}
-
using BrowserPermissionCallback = base::Callback<void(ContentSetting)>;
// This base class contains common operations for granting permissions.
@@ -164,10 +160,6 @@ class PermissionContextBase : public KeyedService {
return content_settings_type_;
}
- // Virtual to allow for mocking in tests.
- virtual scoped_refptr<safe_browsing::SafeBrowsingDatabaseManager>
- GetSafeBrowsingDatabaseManager();
-
private:
friend class PermissionContextBaseTests;
@@ -185,15 +177,9 @@ class PermissionContextBase : public KeyedService {
const BrowserPermissionCallback& callback,
bool permission_blocked);
- void SetSafeBrowsingDatabaseManagerAndTimeoutForTest(
- scoped_refptr<safe_browsing::SafeBrowsingDatabaseManager> db_manager,
- int timeout);
-
Profile* profile_;
const content::PermissionType permission_type_;
const ContentSettingsType content_settings_type_;
- int safe_browsing_timeout_;
- scoped_refptr<safe_browsing::SafeBrowsingDatabaseManager> db_manager_;
#if defined(OS_ANDROID)
std::unique_ptr<PermissionQueueController> permission_queue_controller_;
#endif

Powered by Google App Engine
This is Rietveld 408576698