diff options
| author | erikwright@chromium.org <erikwright@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-02 13:38:57 +0000 |
|---|---|---|
| committer | erikwright@chromium.org <erikwright@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-02 13:38:57 +0000 |
| commit | 8976e29cda1d14b899be6f13366dbb34379ca53d (patch) | |
| tree | b3c659e3c5c50640b8b105a3c011d44369c3afe8 /net/cookies | |
| parent | 6276b496c2b9b0060fc1a2c147f156e6673649d4 (diff) | |
| download | chromium_src-8976e29cda1d14b899be6f13366dbb34379ca53d.zip chromium_src-8976e29cda1d14b899be6f13366dbb34379ca53d.tar.gz chromium_src-8976e29cda1d14b899be6f13366dbb34379ca53d.tar.bz2 | |
Promote the priority aware cookie eviction algorithm from experimental status.
BUG=232693
TBR=huangs@chromium.org,asvitkine@chromium.org
Review URL: https://codereview.chromium.org/54303010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@232604 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/cookies')
| -rw-r--r-- | net/cookies/cookie_monster.cc | 18 | ||||
| -rw-r--r-- | net/cookies/cookie_monster.h | 6 | ||||
| -rw-r--r-- | net/cookies/cookie_monster_unittest.cc | 1 |
3 files changed, 2 insertions, 23 deletions
diff --git a/net/cookies/cookie_monster.cc b/net/cookies/cookie_monster.cc index f8dae50..b7ce4d9 100644 --- a/net/cookies/cookie_monster.cc +++ b/net/cookies/cookie_monster.cc @@ -330,8 +330,7 @@ CookieMonster::CookieMonster(PersistentCookieStore* store, Delegate* delegate) delegate_(delegate), last_statistic_record_time_(Time::Now()), keep_expired_cookies_(false), - persist_session_cookies_(false), - priority_aware_garbage_collection_(false) { + persist_session_cookies_(false) { InitializeHistograms(); SetDefaultCookieableSchemes(); } @@ -347,8 +346,7 @@ CookieMonster::CookieMonster(PersistentCookieStore* store, delegate_(delegate), last_statistic_record_time_(base::Time::Now()), keep_expired_cookies_(false), - persist_session_cookies_(false), - priority_aware_garbage_collection_(false) { + persist_session_cookies_(false) { InitializeHistograms(); SetDefaultCookieableSchemes(); } @@ -1419,13 +1417,6 @@ void CookieMonster::SetPersistSessionCookies(bool persist_session_cookies) { persist_session_cookies_ = persist_session_cookies; } -// This function must be called before the CookieMonster is used. -void CookieMonster::SetPriorityAwareGarbageCollection( - bool priority_aware_garbage_collection) { - DCHECK(!initialized_); - priority_aware_garbage_collection_ = priority_aware_garbage_collection; -} - void CookieMonster::SetForceKeepSessionState() { if (store_.get()) { store_->SetForceKeepSessionState(); @@ -1968,11 +1959,6 @@ int CookieMonster::GarbageCollect(const Time& current, for (int i = 0; i < 3 && purge_goal > 0; ++i) { accumulated_quota += quota[i]; - // If we are not using priority, only do Round 3. This reproduces the - // old way of indiscriminately purging least-recently accessed cookies. - if (!priority_aware_garbage_collection_ && i < 2) - continue; - size_t num_considered = it_bdd[i + 1] - it_purge_begin; if (num_considered <= accumulated_quota) continue; diff --git a/net/cookies/cookie_monster.h b/net/cookies/cookie_monster.h index 135de0b..de00319 100644 --- a/net/cookies/cookie_monster.h +++ b/net/cookies/cookie_monster.h @@ -288,11 +288,6 @@ class NET_EXPORT CookieMonster : public CookieStore { // (i.e. as part of the instance initialization process). void SetPersistSessionCookies(bool persist_session_cookies); - // Enables the new garbage collection algorithm where domain cookie eviction - // uses cookie priorities to decide which cookies to purge and which to keep. - void SetPriorityAwareGarbageCollection( - bool priority_aware_garbage_collection); - // Debugging method to perform various validation checks on the map. // Currently just checking that there are no null CanonicalCookie pointers // in the map. @@ -680,7 +675,6 @@ class NET_EXPORT CookieMonster : public CookieStore { bool keep_expired_cookies_; bool persist_session_cookies_; - bool priority_aware_garbage_collection_; // Static setting for whether or not file scheme cookies are allows when // a new CookieMonster is created, or the accepted schemes on a CookieMonster diff --git a/net/cookies/cookie_monster_unittest.cc b/net/cookies/cookie_monster_unittest.cc index e84df75..69d98a1 100644 --- a/net/cookies/cookie_monster_unittest.cc +++ b/net/cookies/cookie_monster_unittest.cc @@ -572,7 +572,6 @@ class CookieMonsterTest : public CookieStoreTest<CookieMonsterTestTraits> { DCHECK_EQ(70U, CookieMonster::kDomainCookiesQuotaHigh); scoped_refptr<CookieMonster> cm(new CookieMonster(NULL, NULL)); - cm->SetPriorityAwareGarbageCollection(true); // Each test case adds 181 cookies, so 31 cookies are evicted. // Cookie same priority, repeated for each priority. |