Drop the PRE_SAFE/POST_SAFE distinction.
I don't think anyone is looking at this data, and it's marginally less
complicated to ignore the distinction.
[email protected]
Review URL: https://codereview.chromium.org/1769023003
Cr-Commit-Position: refs/heads/master@{#380641}
diff --git a/net/cookies/cookie_monster.cc b/net/cookies/cookie_monster.cc
index 19a2d6ac7..1984bad6 100644
--- a/net/cookies/cookie_monster.cc
+++ b/net/cookies/cookie_monster.cc
@@ -1901,9 +1901,8 @@
size_t quota = 0;
for (size_t i = 0; i < arraysize(kQuotas) && purge_goal > 0; i++) {
quota += kQuotas[i];
- size_t just_deleted =
- PurgeLeastRecentMatches(cookie_its, static_cast<CookiePriority>(i),
- quota, purge_goal, safe_date);
+ size_t just_deleted = PurgeLeastRecentMatches(
+ cookie_its, static_cast<CookiePriority>(i), quota, purge_goal);
DCHECK_LE(just_deleted, purge_goal);
purge_goal -= just_deleted;
num_deleted += just_deleted;
@@ -1959,8 +1958,7 @@
size_t CookieMonster::PurgeLeastRecentMatches(CookieItVector* cookies,
CookiePriority priority,
size_t to_protect,
- size_t purge_goal,
- const base::Time& safe_date) {
+ size_t purge_goal) {
DCHECK(thread_checker_.CalledOnValidThread());
// Find the first protected cookie by walking down from the end of the list
@@ -1980,11 +1978,8 @@
size_t current = 0;
while (removed < purge_goal && current < protection_boundary) {
if (cookies->at(current)->second->Priority() <= priority) {
- InternalDeleteCookie(
- cookies->at(current), true,
- cookies->at(current)->second->LastAccessDate() > safe_date
- ? DELETE_COOKIE_EVICTED_DOMAIN_PRE_SAFE
- : DELETE_COOKIE_EVICTED_DOMAIN_POST_SAFE);
+ InternalDeleteCookie(cookies->at(current), true,
+ DELETE_COOKIE_EVICTED_DOMAIN);
cookies->erase(cookies->begin() + current);
removed++;
