Give two RemoveStaleEntries functions unique names
chrome/browser/previews have two distinct (but similar)
RemoveStaleEntries functions and in some extreme jumbo builds
they compile in the same translation unit and clash.
This CL renames them RemoveStaleBlacklistEntries and
RemoveStaleOfflinePageEntries.
Bug: 914577
Change-Id: I69a837393d0586194bcd85f66eadfe85522418e9
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1584261
Commit-Queue: Robert Ogden <robertogden@chromium.org>
Auto-Submit: Daniel Bratell <bratell@opera.com>
Reviewed-by: Robert Ogden <robertogden@chromium.org>
Cr-Commit-Position: refs/heads/master@{#654453}
diff --git a/chrome/browser/previews/previews_lite_page_decider.cc b/chrome/browser/previews/previews_lite_page_decider.cc
index de12c60..036d3af 100644
--- a/chrome/browser/previews/previews_lite_page_decider.cc
+++ b/chrome/browser/previews/previews_lite_page_decider.cc
@@ -50,7 +50,7 @@
// Cleans up the given host blacklist by removing all stale (expiry has passed)
// entries. If after removing all stale entries, the blacklist is still over
// capacity, then remove the entry with the closest expiration.
-void RemoveStaleEntries(base::DictionaryValue* dict) {
+void RemoveStaleBlacklistEntries(base::DictionaryValue* dict) {
std::vector<std::string> keys_to_delete;
base::Time min_value = base::Time::Max();
@@ -405,7 +405,7 @@
host_bypass_blacklist_->SetKey(
host, base::Value((base::Time::Now() + duration).ToDoubleT()));
- RemoveStaleEntries(host_bypass_blacklist_.get());
+ RemoveStaleBlacklistEntries(host_bypass_blacklist_.get());
if (pref_service_)
pref_service_->Set(kHostBlacklist, *host_bypass_blacklist_);
}
diff --git a/chrome/browser/previews/previews_offline_helper.cc b/chrome/browser/previews/previews_offline_helper.cc
index d9cd2a21..977b2bd 100644
--- a/chrome/browser/previews/previews_offline_helper.cc
+++ b/chrome/browser/previews/previews_offline_helper.cc
@@ -51,7 +51,7 @@
// Cleans up the given dictionary by removing all stale (expiry has passed)
// entries.
-void RemoveStaleEntries(base::DictionaryValue* dict) {
+void RemoveStaleOfflinePageEntries(base::DictionaryValue* dict) {
base::Time earliest_expiry = base::Time::Max();
std::string earliest_key;
std::vector<std::string> keys_to_delete;
@@ -85,8 +85,8 @@
for (const std::string& key : keys_to_delete)
dict->RemoveKey(key);
- // RemoveStaleEntries is called for every new added page, so it's fine to just
- // remove one at a time to keep the pref size below a threshold.
+ // RemoveStaleOfflinePageEntries is called for every new added page, so it's
+ // fine to just remove one at a time to keep the pref size below a threshold.
if (dict->DictSize() > previews::params::OfflinePreviewsHelperMaxPrefSize()) {
dict->RemoveKey(earliest_key);
}
@@ -109,7 +109,7 @@
// Tidy up the pref in case it's been a while since the last stale item
// removal.
- RemoveStaleEntries(available_pages_.get());
+ RemoveStaleOfflinePageEntries(available_pages_.get());
UpdatePref();
#if BUILDFLAG(ENABLE_OFFLINE_PAGES)
@@ -196,7 +196,7 @@
base::Value(TimeToDictionaryValue(added_page.creation_time)));
}
- RemoveStaleEntries(available_pages_.get());
+ RemoveStaleOfflinePageEntries(available_pages_.get());
UpdatePref();
}
@@ -207,7 +207,7 @@
// Has no effect if the url was never in the dictionary.
available_pages_->RemoveKey(HashURL(page_info.url));
- RemoveStaleEntries(available_pages_.get());
+ RemoveStaleOfflinePageEntries(available_pages_.get());
UpdatePref();
}
