Drop the PRE_SAFE/POST_SAFE distinction.

net/cookies/cookie_monster.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Portions of this code based on Mozilla:
 //   (netwerk/cookie/src/nsCookieService.cpp)
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
@@ skipping 1883 matching lines @@
       // cookies with low-priority. Then, if cookies still need to be removed,
       // bump the quota and remove low- and medium-priority. Then, if cookies
       // _still_ need to be removed, bump the quota and remove cookies with
       // any priority.
       const size_t kQuotas[3] = {kDomainCookiesQuotaLow,
                                  kDomainCookiesQuotaMedium,
                                  kDomainCookiesQuotaHigh};
       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;
       }
 
       DCHECK_EQ(0U, purge_goal);
     }
   }
 
   // Collect garbage for everything. With firefox style we want to preserve
@@ skipping 35 matching lines @@
       }
     }
   }
 
   return num_deleted;
 }
 
 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
   // cookie list (most-recently accessed) until |to_protect| cookies that match
   // |priority| are found.
   size_t protection_boundary = cookies->size();
   while (to_protect > 0 && protection_boundary > 0) {
     protection_boundary--;
     if (cookies->at(protection_boundary)->second->Priority() <= priority)
       to_protect--;
   }
 
   // Now, walk up from the beginning of the list (least-recently accessed) until
   // |purge_goal| cookies are removed, or the iterator hits
   // |protection_boundary|.
   size_t removed = 0;
   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++;
 
       // The call to 'erase' above shifts the contents of the vector, but
       // doesn't shift |protection_boundary|. Decrement that here to ensure that
       // the correct set of cookies is protected.
       protection_boundary--;
     } else {
       current++;
     }
@@ skipping 341 matching lines @@
        it != hook_map_.end(); ++it) {
     std::pair<GURL, std::string> key = it->first;
     if (cookie.IncludeForRequestURL(key.first, opts) &&
         cookie.Name() == key.second) {
       it->second->Notify(cookie, removed);
     }
   }
 }
 
 }  // namespace net