Index: chrome/browser/safe_browsing/safe_browsing_database.cc |
diff --git a/chrome/browser/safe_browsing/safe_browsing_database.cc b/chrome/browser/safe_browsing/safe_browsing_database.cc |
index e3f4151b4d6f4a678e076672f9afa3e78367cc59..ba270ce02ecd17d0837be711e7f392073d11a65a 100644 |
--- a/chrome/browser/safe_browsing/safe_browsing_database.cc |
+++ b/chrome/browser/safe_browsing/safe_browsing_database.cc |
@@ -1347,15 +1347,11 @@ void SafeBrowsingDatabaseNew::UpdateWhitelistStore( |
// hashes are already full. |
std::vector<SBAddFullHash> empty_add_hashes; |
- // Not needed for the whitelists. |
- std::set<SBPrefix> empty_miss_cache; |
- |
// Note: prefixes will not be empty. The current data store implementation |
// stores all full-length hashes as both full and prefix hashes. |
SBAddPrefixes prefixes; |
std::vector<SBAddFullHash> full_hashes; |
- if (!store->FinishUpdate(empty_add_hashes, empty_miss_cache, &prefixes, |
- &full_hashes)) { |
+ if (!store->FinishUpdate(empty_add_hashes, &prefixes, &full_hashes)) { |
RecordFailure(FAILURE_WHITELIST_DATABASE_UPDATE_FINISH); |
WhitelistEverything(whitelist); |
return; |
@@ -1375,16 +1371,12 @@ int64 SafeBrowsingDatabaseNew::UpdateHashPrefixStore( |
// We don't cache and save full hashes. |
std::vector<SBAddFullHash> empty_add_hashes; |
- // Backend lookup happens only if a prefix is in add list. |
- std::set<SBPrefix> empty_miss_cache; |
- |
// These results are not used after this call. Simply ignore the |
// returned value after FinishUpdate(...). |
SBAddPrefixes add_prefixes_result; |
std::vector<SBAddFullHash> add_full_hashes_result; |
if (!store->FinishUpdate(empty_add_hashes, |
- empty_miss_cache, |
&add_prefixes_result, |
&add_full_hashes_result)) { |
RecordFailure(failure_type); |
@@ -1429,7 +1421,7 @@ void SafeBrowsingDatabaseNew::UpdateBrowseStore() { |
SBAddPrefixes add_prefixes; |
std::vector<SBAddFullHash> add_full_hashes; |
- if (!browse_store_->FinishUpdate(pending_add_hashes, prefix_miss_cache_, |
+ if (!browse_store_->FinishUpdate(pending_add_hashes, |
&add_prefixes, &add_full_hashes)) { |
RecordFailure(FAILURE_BROWSE_DATABASE_UPDATE_FINISH); |
return; |
@@ -1508,13 +1500,11 @@ void SafeBrowsingDatabaseNew::UpdateBrowseStore() { |
void SafeBrowsingDatabaseNew::UpdateSideEffectFreeWhitelistStore() { |
std::vector<SBAddFullHash> empty_add_hashes; |
- std::set<SBPrefix> empty_miss_cache; |
SBAddPrefixes add_prefixes; |
std::vector<SBAddFullHash> add_full_hashes_result; |
if (!side_effect_free_whitelist_store_->FinishUpdate( |
empty_add_hashes, |
- empty_miss_cache, |
&add_prefixes, |
&add_full_hashes_result)) { |
RecordFailure(FAILURE_SIDE_EFFECT_FREE_WHITELIST_UPDATE_FINISH); |
@@ -1575,14 +1565,11 @@ void SafeBrowsingDatabaseNew::UpdateIpBlacklistStore() { |
// hashes are already full. |
std::vector<SBAddFullHash> empty_add_hashes; |
- // Not needed for the IP blacklist. |
- std::set<SBPrefix> empty_miss_cache; |
- |
// Note: prefixes will not be empty. The current data store implementation |
// stores all full-length hashes as both full and prefix hashes. |
SBAddPrefixes prefixes; |
std::vector<SBAddFullHash> full_hashes; |
- if (!ip_blacklist_store_->FinishUpdate(empty_add_hashes, empty_miss_cache, |
+ if (!ip_blacklist_store_->FinishUpdate(empty_add_hashes, |
&prefixes, &full_hashes)) { |
RecordFailure(FAILURE_IP_BLACKLIST_UPDATE_FINISH); |
LoadIpBlacklist(std::vector<SBAddFullHash>()); // Clear the list. |