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

Unified Diff: chrome/browser/permissions/permission_blacklist_client.cc

Issue 2684523002: Check result of ApiBlacklist query in client. (Closed)
Patch Set: Check callback. Created 3 years, 10 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
« no previous file with comments | « no previous file | chrome/browser/permissions/permission_context_base_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 ef0be9b38574c4b4515a9923c5d5666b2d5ff6c4..35386710372b2842c755bd22e604cb199e0ec88e 100644
--- a/chrome/browser/permissions/permission_blacklist_client.cc
+++ b/chrome/browser/permissions/permission_blacklist_client.cc
@@ -41,7 +41,7 @@ PermissionBlacklistClient::PermissionBlacklistClient(
callback_(callback),
timeout_(timeout),
is_active_(true) {
- // Balanced by a call to Release() in OnCheckApiBlacklistUrlResult().
+ // Balanced by a call to Release() in EvaluateBlacklistResultOnUiThread().
AddRef();
content::BrowserThread::PostTask(
content::BrowserThread::IO, FROM_HERE,
@@ -61,14 +61,16 @@ void PermissionBlacklistClient::StartCheck(const GURL& request_origin) {
FROM_HERE, base::TimeDelta::FromMilliseconds(timeout_),
base::Bind(&PermissionBlacklistClient::OnCheckApiBlacklistUrlResult, this,
request_origin, empty_metadata));
- db_manager_->CheckApiBlacklistUrl(request_origin, this);
+ // If CheckApiBlacklistUrl returns true, no asynchronous call to |this| will
+ // be made, so just directly call through to OnCheckApiBlacklistUrlResult.
+ if (db_manager_->CheckApiBlacklistUrl(request_origin, this))
+ OnCheckApiBlacklistUrlResult(request_origin, empty_metadata);
}
void PermissionBlacklistClient::OnCheckApiBlacklistUrlResult(
const GURL& url,
const safe_browsing::ThreatMetadata& metadata) {
DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
-
if (timer_->IsRunning())
timer_->Stop();
else
« no previous file with comments | « no previous file | chrome/browser/permissions/permission_context_base_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698