Revert of Evict non-secure cookies less agressively.

net/cookies/cookie_monster.h

 // 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.
 
 // Brought to you by the letter D and the number 2.
 
 #ifndef NET_COOKIES_COOKIE_MONSTER_H_
 #define NET_COOKIES_COOKIE_MONSTER_H_
 
 #include <stddef.h>
@@ skipping 111 matching lines @@
   //
   // Any cookies accessed more recently than kSafeFromGlobalPurgeDays will not
   // be evicted by global garbage collection, even if we have more than
   // kMaxCookies.  This does not affect domain garbage collection.
   static const size_t kDomainMaxCookies;
   static const size_t kDomainPurgeCookies;
   static const size_t kMaxCookies;
   static const size_t kPurgeCookies;
 
   // Quota for cookies with {low, medium, high} priorities within a domain.
-  // The quota is specified as a percentage of the total number of cookies we
-  // intend to retain for a domain.
-  static const double kDomainCookiesQuotaLow;
-  static const double kDomainCookiesQuotaMedium;
-  static const double kDomainCookiesQuotaHigh;
+  static const size_t kDomainCookiesQuotaLow;
+  static const size_t kDomainCookiesQuotaMedium;
+  static const size_t kDomainCookiesQuotaHigh;
 
   // The store passed in should not have had Init() called on it yet. This
   // class will take care of initializing it. The backing store is NOT owned by
   // this class, but it must remain valid for the duration of the cookie
   // monster's existence. If |store| is NULL, then no backing store will be
   // updated. If |delegate| is non-NULL, it will be notified on
   // creation/deletion of cookies.
   CookieMonster(PersistentCookieStore* store, CookieMonsterDelegate* delegate);
 
   // Only used during unit testing.
@@ skipping 223 matching lines @@
   // directly before COOKIE_DELETE_EQUIVALENT_LAST_ENTRY and histograms.xml must
   // be updated accordingly.
   enum CookieDeleteEquivalent {
     COOKIE_DELETE_EQUIVALENT_ATTEMPT = 0,
     COOKIE_DELETE_EQUIVALENT_FOUND,
     COOKIE_DELETE_EQUIVALENT_SKIPPING_SECURE,
     COOKIE_DELETE_EQUIVALENT_WOULD_HAVE_DELETED,
     COOKIE_DELETE_EQUIVALENT_LAST_ENTRY
   };
 
-  enum GCType { GC_NONSECURE, GC_SECURE };
-
   // The strategy for fetching cookies. Controlled by Finch experiment.
   enum FetchStrategy {
     // Fetches all cookies only when they're needed.
     kFetchWhenNecessary = 0,
     // Fetches all cookies as soon as any cookie is needed.
     // This is the default behavior.
     kAlwaysFetch,
     // The fetch strategy is not yet determined.
     kUnknownFetch,
   };
@@ skipping 196 matching lines @@
                                    CookieItVector::iterator cookie_its_end);
 
   // Helper for GarbageCollect(). Deletes cookies in |cookie_its| from least to
   // most recently used, but only before |safe_date|. Also will stop deleting
   // when the number of remaining cookies hits |purge_goal|.
   size_t GarbageCollectLeastRecentlyAccessed(const base::Time& current,
                                              const base::Time& safe_date,
                                              size_t purge_goal,
                                              CookieItVector cookie_its);
 
-  // Helper for GarbageCollect(). Deletes |purge_goal| cookies of type |type|
-  // from the ranges specified in |it_bdd|. Returns the number of cookies
-  // deleted.
-  //
-  // |it_bdd| is a bit of a complicated beast: it must be a 7-element array
-  // of 'CookieItVector::Iterator' objects that demarcate the boundaries of
-  // a list of cookies sorted first by secure/non-secure, and then by priority,
-  // low to high. That is, it ought to look something like:
-  //
-  // LLLLMMMMHHHHHLLLLMMMMHHHH
-  // ^   ^   ^    ^   ^   ^   ^
-  // 0   1   2    3   4   5   6
-  //
-  // TODO(mkwst): This is super-complicated. We should determine whether we
-  // can simplify our implementation of "priority".
-  size_t GarbageCollectNumFromRangeWithQuota(const base::Time& current,
-                                             const base::Time& safe_date,
-                                             size_t purge_goal,
-                                             CookieItVector::iterator* it_bdd,
-                                             GCType type);
-
   // Find the key (for lookup in cookies_) based on the given domain.
   // See comment on keys before the CookieMap typedef.
   std::string GetKey(const std::string& domain) const;
 
   bool HasCookieableScheme(const GURL& url);
 
   // Statistics support
 
   // This function should be called repeatedly, and will record
   // statistics if a sufficient time period has passed.
@@ skipping 187 matching lines @@
   virtual ~PersistentCookieStore() {}
 
  private:
   friend class base::RefCountedThreadSafe<PersistentCookieStore>;
   DISALLOW_COPY_AND_ASSIGN(PersistentCookieStore);
 };
 
 }  // namespace net
 
 #endif  // NET_COOKIES_COOKIE_MONSTER_H_