Update cookie expiry policy to attempt to avoid deleting "in-use" cookies. S...

net/base/cookie_monster.h

 // Copyright (c) 2006-2008 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.
 
 // Brought to you by the letter D and the number 2.
 
 #ifndef NET_BASE_COOKIE_MONSTER_H_
 #define NET_BASE_COOKIE_MONSTER_H_
 
 #include <map>
@@ skipping 167 matching lines @@
   void InternalDeleteCookie(CookieMap::iterator it, bool sync_to_store);
 
   // If the number of cookies for host |key|, or globally, are over preset
   // maximums, garbage collects, first for the host and then globally, as
   // described by GarbageCollectRange().  The limits can be found as constants
   // at the top of the function body.
   //
   // Returns the number of cookies deleted (useful for debugging).
   int GarbageCollect(const base::Time& current, const std::string& key);
 
-  // Deletes all expired cookies in |itpair|;
-  // then, if the number of remaining cookies is greater than |num_max|,
-  // collects the least recently accessed cookies until
-  // (|num_max| - |num_purge|) cookies remain.
+  // Deletes all expired cookies in |itpair|; then, if the number of remaining
+  // cookies is greater than |max_cookies|, collects the least recently accessed
+  // cookies until that many cookies remain.  If |purge_age| is non-zero, only
+  // cookies accessed longer ago than |purge_age| are collected.
   //
   // Returns the number of cookies deleted.
   int GarbageCollectRange(const base::Time& current,
                           const CookieMapItPair& itpair,
-                          size_t num_max,
-                          size_t num_purge);
+                          size_t max_cookies,
+                          const base::TimeDelta& purge_age);
 
   // Helper for GarbageCollectRange(); can be called directly as well.  Deletes
   // all expired cookies in |itpair|.  If |cookie_its| is non-NULL, it is
   // populated with all the non-expired cookies from |itpair|.
   //
   // Returns the number of cookies deleted.
   int GarbageCollectExpired(const base::Time& current,
                             const CookieMapItPair& itpair,
                             std::vector<CookieMap::iterator>* cookie_its);
 
   bool HasCookieableScheme(const GURL& url);
 
   CookieMap cookies_;
 
+  // The last-accessed time of the oldest (LRU) cookie in the DB.
+  base::Time least_recent_access_;
+
   // Indicates whether the cookie store has been initialized. This happens
   // lazily in InitStoreIfNecessary().
   bool initialized_;
 
   PersistentCookieStore* store_;
 
   // The resolution of our time isn't enough, so we do something
   // ugly and increment when we've seen the same time twice.
   base::Time CurrentTime();
   base::Time last_time_seen_;
@@ skipping 144 matching lines @@
   bool secure_;
   bool httponly_;
 };
 
 class CookieMonster::PersistentCookieStore {
  public:
   virtual ~PersistentCookieStore() { }
 
   // Initializes the store and retrieves the existing cookies. This will be
   // called only once at startup.
-  virtual bool Load(std::vector<CookieMonster::KeyedCanonicalCookie>*) = 0;
+  // The second argument will be set to the oldest last-accessed date seen.
+  virtual bool Load(std::vector<CookieMonster::KeyedCanonicalCookie>*,
+                    base::Time*) = 0;
 
   virtual void AddCookie(const std::string&, const CanonicalCookie&) = 0;
   virtual void UpdateCookieAccessTime(const CanonicalCookie&) = 0;
   virtual void DeleteCookie(const CanonicalCookie&) = 0;
 
  protected:
   PersistentCookieStore() { }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(PersistentCookieStore);
 };
 
 }  // namespace net
 
 #endif  // NET_BASE_COOKIE_MONSTER_H_