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

Unified Diff: chrome/browser/safe_browsing/local_database_manager.cc

Issue 1579183003: Only call UrlToFullHashes once from LocalSafeBrowsingDatabaseManager::CheckBrowseUrl (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix param name Created 4 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/safe_browsing/local_database_manager.cc
diff --git a/chrome/browser/safe_browsing/local_database_manager.cc b/chrome/browser/safe_browsing/local_database_manager.cc
index 0abdac70e4ddcc6b47d97e8b4300a271057be22f..0721b80942172862b4213bc56fbce3b2d2152cc1 100644
--- a/chrome/browser/safe_browsing/local_database_manager.cc
+++ b/chrome/browser/safe_browsing/local_database_manager.cc
@@ -480,14 +480,17 @@ bool LocalSafeBrowsingDatabaseManager::CheckBrowseUrl(const GURL& url,
// TODO(gab): Refactor SafeBrowsingDatabase to avoid depending on this here.
std::vector<SBFullHashResult> cache_hits;
+ std::vector<SBFullHash> full_hashes;
+ UrlToFullHashes(url, false, &full_hashes);
+
std::vector<SBPrefix> browse_prefix_hits;
- bool browse_prefix_match = database_->ContainsBrowseUrl(
- url, &browse_prefix_hits, &cache_hits);
+ bool browse_prefix_match = database_->ContainsBrowseHashes(
+ full_hashes, &browse_prefix_hits, &cache_hits);
std::vector<SBPrefix> unwanted_prefix_hits;
std::vector<SBFullHashResult> unused_cache_hits;
- bool unwanted_prefix_match = database_->ContainsUnwantedSoftwareUrl(
- url, &unwanted_prefix_hits, &unused_cache_hits);
+ bool unwanted_prefix_match = database_->ContainsUnwantedSoftwareHashes(
+ full_hashes, &unwanted_prefix_hits, &unused_cache_hits);
// Merge the two pre-sorted prefix hits lists.
// TODO(gab): Refactor SafeBrowsingDatabase for it to return this merged list

Powered by Google App Engine
This is Rietveld 408576698