Revert of Evict non-secure cookies less agressively.

net/cookies/cookie_monster_unittest.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.
 
 #include "net/cookies/cookie_store_unittest.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
@@ skipping 335 matching lines @@
       case 'H':
         return COOKIE_PRIORITY_HIGH;
     }
     NOTREACHED();
     return COOKIE_PRIORITY_DEFAULT;
   }
 
   // Instantiates a CookieMonster, adds multiple cookies (to http_www_google_)
   // with priorities specified by |coded_priority_str|, and tests priority-aware
   // domain cookie eviction.
-  //
-  // Example: |coded_priority_string| of "2MN 3LS MN 4HN" specifies sequential
-  // (i.e., from least- to most-recently accessed) insertion of 2
-  // medium-priority non-secure cookies, 3 low-priority secure cookies, 1
-  // medium-priority non-secure cookie, and 4 high-priority non-secure cookies.
-  //
+  // |coded_priority_str| specifies a run-length-encoded string of priorities.
+  // Example: "2M 3L M 4H" means "MMLLLMHHHH", and speicifies sequential (i.e.,
+  // from least- to most-recently accessed) insertion of 2 medium-priority
+  // cookies, 3 low-priority cookies, 1 medium-priority cookie, and 4
+  // high-priority cookies.
   // Within each priority, only the least-accessed cookies should be evicted.
   // Thus, to describe expected suriving cookies, it suffices to specify the
   // expected population of surviving cookies per priority, i.e.,
   // |expected_low_count|, |expected_medium_count|, and |expected_high_count|.
   void TestPriorityCookieCase(CookieMonster* cm,
                               const std::string& coded_priority_str,
                               size_t expected_low_count,
                               size_t expected_medium_count,
-                              size_t expected_high_count,
-                              size_t expected_nonsecure,
-                              size_t expected_secure) {
-    SCOPED_TRACE(coded_priority_str.c_str());
+                              size_t expected_high_count) {
     this->DeleteAll(cm);
     int next_cookie_id = 0;
-    // A list of cookie IDs, indexed by secure status, then by priority.
-    std::vector<int> id_list[2][3];
-    // A list of all the cookies stored, along with their properties.
-    std::vector<std::pair<bool, CookiePriority>> cookie_data;
+    std::vector<CookiePriority> priority_list;
+    std::vector<int> id_list[3];  // Indexed by CookiePriority.
 
     // Parse |coded_priority_str| and add cookies.
     for (const std::string& token :
          base::SplitString(coded_priority_str, " ", base::TRIM_WHITESPACE,
                            base::SPLIT_WANT_ALL)) {
       DCHECK(!token.empty());
-
-      // Take last character as security status, then discard it.
-      bool is_secure = token[token.size() - 1] == 'S';
-
-      // The second-to-last character is the priority. Grab and discard it.
-      CookiePriority priority = CharToPriority(token[token.size() - 2]);
-
+      // Take last character as priority.
+      CookiePriority priority = CharToPriority(token.back());
+      std::string priority_str = CookiePriorityToString(priority);
       // The rest of the string (possibly empty) specifies repetition.
       int rep = 1;
       if (!token.empty()) {
         bool result = base::StringToInt(
-            base::StringPiece(token.begin(), token.end() - 2), &rep);
+            base::StringPiece(token.begin(), token.end() - 1), &rep);
         DCHECK(result);
       }
       for (; rep > 0; --rep, ++next_cookie_id) {
-        std::string cookie =
-            base::StringPrintf("a%d=b;priority=%s;%s", next_cookie_id,
-                               CookiePriorityToString(priority).c_str(),
-                               is_secure ? "secure" : "");
-        EXPECT_TRUE(SetCookie(cm, https_www_google_.url(), cookie));
-        cookie_data.push_back(std::make_pair(is_secure, priority));
-        id_list[is_secure][priority].push_back(next_cookie_id);
+        std::string cookie = base::StringPrintf(
+            "a%d=b;priority=%s", next_cookie_id, priority_str.c_str());
+        EXPECT_TRUE(SetCookie(cm, http_www_google_.url(), cookie));
+        priority_list.push_back(priority);
+        id_list[priority].push_back(next_cookie_id);
       }
     }
 
-    int num_cookies = static_cast<int>(cookie_data.size());
-    // A list of cookie IDs, indexed by secure status, then by priority.
-    std::vector<int> surviving_id_list[2][3];
+    int num_cookies = static_cast<int>(priority_list.size());
+    std::vector<int> surviving_id_list[3];  // Indexed by CookiePriority.
 
     // Parse the list of cookies
-    std::string cookie_str = this->GetCookies(cm, https_www_google_.url());
-    size_t num_nonsecure = 0;
-    size_t num_secure = 0;
+    std::string cookie_str = this->GetCookies(cm, http_www_google_.url());
     for (const std::string& token : base::SplitString(
              cookie_str, ";", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL)) {
       // Assuming *it is "a#=b", so extract and parse "#" portion.
       int id = -1;
       bool result = base::StringToInt(
           base::StringPiece(token.begin() + 1, token.end() - 2), &id);
       DCHECK(result);
       DCHECK_GE(id, 0);
       DCHECK_LT(id, num_cookies);
-      surviving_id_list[cookie_data[id].first][cookie_data[id].second]
-          .push_back(id);
-      if (cookie_data[id].first)
-        num_secure += 1;
-      else
-        num_nonsecure += 1;
+      surviving_id_list[priority_list[id]].push_back(id);
     }
 
-    EXPECT_EQ(expected_nonsecure, num_nonsecure);
-    EXPECT_EQ(expected_secure, num_secure);
-
     // Validate each priority.
     size_t expected_count[3] = {
         expected_low_count, expected_medium_count, expected_high_count};
     for (int i = 0; i < 3; ++i) {
-      size_t num_for_priority =
-          surviving_id_list[0][i].size() + surviving_id_list[1][i].size();
-      EXPECT_EQ(expected_count[i], num_for_priority);
+      DCHECK_LE(surviving_id_list[i].size(), id_list[i].size());
+      EXPECT_EQ(expected_count[i], surviving_id_list[i].size());
       // Verify that the remaining cookies are the most recent among those
       // with the same priorities.
-      if (expected_count[i] == num_for_priority) {
-        // Non-secure:
-        std::sort(surviving_id_list[0][i].begin(),
-                  surviving_id_list[0][i].end());
-        EXPECT_TRUE(std::equal(
-            surviving_id_list[0][i].begin(), surviving_id_list[0][i].end(),
-            id_list[0][i].end() - surviving_id_list[0][i].size()));
-
-        // Secure:
-        std::sort(surviving_id_list[1][i].begin(),
-                  surviving_id_list[1][i].end());
-        EXPECT_TRUE(std::equal(
-            surviving_id_list[1][i].begin(), surviving_id_list[1][i].end(),
-            id_list[1][i].end() - surviving_id_list[1][i].size()));
+      if (expected_count[i] == surviving_id_list[i].size()) {
+        std::sort(surviving_id_list[i].begin(), surviving_id_list[i].end());
+        EXPECT_TRUE(std::equal(surviving_id_list[i].begin(),
+                               surviving_id_list[i].end(),
+                               id_list[i].end() - expected_count[i]));
       }
     }
   }
 
   // Represents a number of cookies to create, if they are Secure cookies, and
   // a url to add them to.
   struct CookiesEntry {
     size_t num_cookies;
     bool is_secure;
   };
@@ skipping 46 matching lines @@
       if (cookie.IsSecure())
         ++total_secure_cookies;
       else
         ++total_non_secure_cookies;
     }
 
     EXPECT_EQ(expected_secure_cookies, total_secure_cookies);
     EXPECT_EQ(expected_non_secure_cookies, total_non_secure_cookies);
   }
 
-  void TestPriorityAwareGarbageCollectHelperNonSecure() {
+  void TestPriorityAwareGarbageCollectHelper() {
     // Hard-coding limits in the test, but use DCHECK_EQ to enforce constraint.
     DCHECK_EQ(180U, CookieMonster::kDomainMaxCookies);
     DCHECK_EQ(150U, CookieMonster::kDomainMaxCookies -
                         CookieMonster::kDomainPurgeCookies);
+    DCHECK_EQ(30U, CookieMonster::kDomainCookiesQuotaLow);
+    DCHECK_EQ(50U, CookieMonster::kDomainCookiesQuotaMedium);
+    DCHECK_EQ(70U, CookieMonster::kDomainCookiesQuotaHigh);
 
     scoped_refptr<CookieMonster> cm(new CookieMonster(NULL, NULL));
 
     // Each test case adds 181 cookies, so 31 cookies are evicted.
     // Cookie same priority, repeated for each priority.
-    TestPriorityCookieCase(cm.get(), "181LN", 150U, 0U, 0U, 150U, 0U);
-    TestPriorityCookieCase(cm.get(), "181MN", 0U, 150U, 0U, 150U, 0U);
-    TestPriorityCookieCase(cm.get(), "181HN", 0U, 0U, 150U, 150U, 0U);
+    TestPriorityCookieCase(cm.get(), "181L", 150U, 0U, 0U);
+    TestPriorityCookieCase(cm.get(), "181M", 0U, 150U, 0U);
+    TestPriorityCookieCase(cm.get(), "181H", 0U, 0U, 150U);
 
     // Pairwise scenarios.
     // Round 1 => none; round2 => 31M; round 3 => none.
-    TestPriorityCookieCase(cm.get(), "10HN 171MN", 0U, 140U, 10U, 150U, 0U);
+    TestPriorityCookieCase(cm.get(), "10H 171M", 0U, 140U, 10U);
     // Round 1 => 10L; round2 => 21M; round 3 => none.
-    TestPriorityCookieCase(cm.get(), "141MN 40LN", 30U, 120U, 0U, 150U, 0U);
+    TestPriorityCookieCase(cm.get(), "141M 40L", 30U, 120U, 0U);
     // Round 1 => none; round2 => none; round 3 => 31H.
-    TestPriorityCookieCase(cm.get(), "101HN 80MN", 0U, 80U, 70U, 150U, 0U);
+    TestPriorityCookieCase(cm.get(), "101H 80M", 0U, 80U, 70U);
 
     // For {low, medium} priorities right on quota, different orders.
     // Round 1 => 1L; round 2 => none, round3 => 30L.
-    TestPriorityCookieCase(cm.get(), "31LN 50MN 100HN", 0U, 50U, 100U, 150U,
-                           0U);
+    TestPriorityCookieCase(cm.get(), "31L 50M 100H", 0U, 50U, 100U);
     // Round 1 => none; round 2 => 1M, round3 => 30M.
-    TestPriorityCookieCase(cm.get(), "51MN 100HN 30LN", 30U, 20U, 100U, 150U,
-                           0U);
+    TestPriorityCookieCase(cm.get(), "51M 100H 30L", 30U, 20U, 100U);
     // Round 1 => none; round 2 => none; round3 => 31H.
-    TestPriorityCookieCase(cm.get(), "101HN 50MN 30LN", 30U, 50U, 70U, 150U,
-                           0U);
+    TestPriorityCookieCase(cm.get(), "101H 50M 30L", 30U, 50U, 70U);
 
     // Round 1 => 10L; round 2 => 10M; round3 => 11H.
-    TestPriorityCookieCase(cm.get(), "81HN 60MN 40LN", 30U, 50U, 70U, 150U, 0U);
+    TestPriorityCookieCase(cm.get(), "81H 60M 40L", 30U, 50U, 70U);
 
     // More complex scenarios.
     // Round 1 => 10L; round 2 => 10M; round 3 => 11H.
-    TestPriorityCookieCase(cm.get(), "21HN 60MN 40LN 60HN", 30U, 50U, 70U, 150U,
-                           0U);
+    TestPriorityCookieCase(cm.get(), "21H 60M 40L 60H", 30U, 50U, 70U);
     // Round 1 => 10L; round 2 => 11M, 10L; round 3 => none.
-    TestPriorityCookieCase(cm.get(), "11HN 10MN 20LN 110MN 20LN 10HN", 20U,
-                           109U, 21U, 150U, 0U);
+    TestPriorityCookieCase(cm.get(), "11H 10M 20L 110M 20L 10H", 20U, 109U,
+                           21U);
     // Round 1 => none; round 2 => none; round 3 => 11L, 10M, 10H.
-    TestPriorityCookieCase(cm.get(), "11LN 10MN 140HN 10MN 10LN", 10U, 10U,
-                           130U, 150U, 0U);
+    TestPriorityCookieCase(cm.get(), "11L 10M 140H 10M 10L", 10U, 10U, 130U);
     // Round 1 => none; round 2 => 1M; round 3 => 10L, 10M, 10H.
-    TestPriorityCookieCase(cm.get(), "11MN 10HN 10LN 60MN 90HN", 0U, 60U, 90U,
-                           150U, 0U);
+    TestPriorityCookieCase(cm.get(), "11M 10H 10L 60M 90H", 0U, 60U, 90U);
     // Round 1 => none; round 2 => 10L, 21M; round 3 => none.
-    TestPriorityCookieCase(cm.get(), "11MN 10HN 10LN 90MN 60HN", 0U, 80U, 70U,
-                           150U, 0U);
-  }
-
-  void TestPriorityAwareGarbageCollectHelperSecure() {
-    // Hard-coding limits in the test, but use DCHECK_EQ to enforce constraint.
-    DCHECK_EQ(180U, CookieMonster::kDomainMaxCookies);
-    DCHECK_EQ(150U, CookieMonster::kDomainMaxCookies -
-                        CookieMonster::kDomainPurgeCookies);
-
-    scoped_refptr<CookieMonster> cm(new CookieMonster(NULL, NULL));
-
-    // Each test case adds 181 cookies, so 31 cookies are evicted.
-    // Cookie same priority, repeated for each priority.
-    TestPriorityCookieCase(cm.get(), "181LS", 150U, 0U, 0U, 0U, 150U);
-    TestPriorityCookieCase(cm.get(), "181MS", 0U, 150U, 0U, 0U, 150U);
-    TestPriorityCookieCase(cm.get(), "181HS", 0U, 0U, 150U, 0U, 150U);
-
-    // Pairwise scenarios.
-    // Round 1 => none; round2 => 31M; round 3 => none.
-    TestPriorityCookieCase(cm.get(), "10HS 171MS", 0U, 140U, 10U, 0U, 150U);
-    // Round 1 => 10L; round2 => 21M; round 3 => none.
-    TestPriorityCookieCase(cm.get(), "141MS 40LS", 30U, 120U, 0U, 0U, 150U);
-    // Round 1 => none; round2 => none; round 3 => 31H.
-    TestPriorityCookieCase(cm.get(), "101HS 80MS", 0U, 80U, 70U, 0U, 150U);
-
-    // For {low, medium} priorities right on quota, different orders.
-    // Round 1 => 1L; round 2 => none, round3 => 30L.
-    TestPriorityCookieCase(cm.get(), "31LS 50MS 100HS", 0U, 50U, 100U, 0U,
-                           150U);
-    // Round 1 => none; round 2 => 1M, round3 => 30M.
-    TestPriorityCookieCase(cm.get(), "51MS 100HS 30LS", 30U, 20U, 100U, 0U,
-                           150U);
-    // Round 1 => none; round 2 => none; round3 => 31H.
-    TestPriorityCookieCase(cm.get(), "101HS 50MS 30LS", 30U, 50U, 70U, 0U,
-                           150U);
-
-    // Round 1 => 10L; round 2 => 10M; round3 => 11H.
-    TestPriorityCookieCase(cm.get(), "81HS 60MS 40LS", 30U, 50U, 70U, 0U, 150U);
-
-    // More complex scenarios.
-    // Round 1 => 10L; round 2 => 10M; round 3 => 11H.
-    TestPriorityCookieCase(cm.get(), "21HS 60MS 40LS 60HS", 30U, 50U, 70U, 0U,
-                           150U);
-    // Round 1 => 10L; round 2 => 11M, 10L; round 3 => none.
-    TestPriorityCookieCase(cm.get(), "11HS 10MS 20LS 110MS 20LS 10HS", 20U,
-                           109U, 21U, 0U, 150U);
-    // Round 1 => none; round 2 => none; round 3 => 11L, 10M, 10H.
-    TestPriorityCookieCase(cm.get(), "11LS 10MS 140HS 10MS 10LS", 10U, 10U,
-                           130U, 0U, 150U);
-    // Round 1 => none; round 2 => 1M; round 3 => 10L, 10M, 10H.
-    TestPriorityCookieCase(cm.get(), "11MS 10HS 10LS 60MS 90HS", 0U, 60U, 90U,
-                           0U, 150U);
-    // Round 1 => none; round 2 => 10L, 21M; round 3 => none.
-    TestPriorityCookieCase(cm.get(), "11MS 10HS 10LS 90MS 60HS", 0U, 80U, 70U,
-                           0U, 150U);
-  }
-
-  void TestPriorityAwareGarbageCollectHelperMixed() {
-    // Hard-coding limits in the test, but use DCHECK_EQ to enforce constraint.
-    DCHECK_EQ(180U, CookieMonster::kDomainMaxCookies);
-    DCHECK_EQ(150U, CookieMonster::kDomainMaxCookies -
-                        CookieMonster::kDomainPurgeCookies);
-
-    scoped_refptr<CookieMonster> cm(new CookieMonster(NULL, NULL));
-
-    // Each test case adds 180 secure cookies, and some non-secure cookie. The
-    // secure cookies take priority, so the non-secure cookie is removed, along
-    // with 30 secure cookies. Repeated for each priority, and with the
-    // non-secure cookie as older and newer.
-    TestPriorityCookieCase(cm.get(), "1LN 180LS", 150U, 0U, 0U, 0U, 150U);
-    TestPriorityCookieCase(cm.get(), "1MN 180MS", 0U, 150U, 0U, 0U, 150U);
-    TestPriorityCookieCase(cm.get(), "1HN 180HS", 0U, 0U, 150U, 0U, 150U);
-    TestPriorityCookieCase(cm.get(), "180LS 1LN", 150U, 0U, 0U, 0U, 150U);
-    TestPriorityCookieCase(cm.get(), "180MS 1MN", 0U, 150U, 0U, 0U, 150U);
-    TestPriorityCookieCase(cm.get(), "180HS 1HN", 0U, 0U, 150U, 0U, 150U);
-
-    // Higher-priority non-secure cookies are removed before any secure cookie.
-    TestPriorityCookieCase(cm.get(), "180LS 1MN", 150U, 0U, 0U, 0U, 150U);
-    TestPriorityCookieCase(cm.get(), "180LS 1HN", 150U, 0U, 0U, 0U, 150U);
-    TestPriorityCookieCase(cm.get(), "180MS 1HN", 0U, 150U, 0U, 0U, 150U);
-    TestPriorityCookieCase(cm.get(), "1MN 180LS", 150U, 0U, 0U, 0U, 150U);
-    TestPriorityCookieCase(cm.get(), "1HN 180LS", 150U, 0U, 0U, 0U, 150U);
-    TestPriorityCookieCase(cm.get(), "1HN 180MS", 0U, 150U, 0U, 0U, 150U);
-
-    // Pairwise:
-    TestPriorityCookieCase(cm.get(), "1LS 180LN", 150U, 0U, 0U, 149U, 1U);
-    TestPriorityCookieCase(cm.get(), "100LS 81LN", 150U, 0U, 0U, 50U, 100U);
-    TestPriorityCookieCase(cm.get(), "150LS 31LN", 150U, 0U, 0U, 0U, 150U);
-    TestPriorityCookieCase(cm.get(), "1LS 180HN", 1U, 0U, 149U, 149U, 1U);
-    TestPriorityCookieCase(cm.get(), "100LS 81HN", 100U, 0U, 50U, 50U, 100U);
-    TestPriorityCookieCase(cm.get(), "150LS 31HN", 150U, 0U, 0U, 0U, 150U);
-
-    // Quota calculations inside non-secure/secure blocks remain in place:
-    TestPriorityCookieCase(cm.get(), "50HN 50LS 81HS", 50U, 0U, 100U, 19U,
-                           131U);
-    TestPriorityCookieCase(cm.get(), "11MS 10HN 10LS 90MN 60HN", 10U, 79U, 61U,
-                           129U, 21U);
-
-    // Multiple GC rounds end up with consistent behavior:
-    TestPriorityCookieCase(cm.get(), "100HS 100LN 100MN", 0, 76U, 100U, 76U,
-                           100U);
+    TestPriorityCookieCase(cm.get(), "11M 10H 10L 90M 60H", 0U, 80U, 70U);
   }
 
   // Function for creating a CM with a number of cookies in it,
   // no store (and hence no ability to affect access time).
   CookieMonster* CreateMonsterForGC(int num_cookies) {
     CookieMonster* cm(new CookieMonster(NULL, NULL));
     for (int i = 0; i < num_cookies; i++) {
       SetCookie(cm, GURL(base::StringPrintf("http://h%05d.izzle", i)), "a=1");
     }
     return cm;
@@ skipping 688 matching lines @@
   base::PlatformThread::Sleep(
       base::TimeDelta::FromMilliseconds(kAccessDelayMs));
   EXPECT_EQ("A=B", GetCookies(cm.get(), http_www_google_.url()));
   EXPECT_FALSE(last_access_date == GetFirstCookieAccessDate(cm.get()));
 }
 
 TEST_F(CookieMonsterTest, TestHostGarbageCollection) {
   TestHostGarbageCollectHelper();
 }
 
-TEST_F(CookieMonsterTest, TestPriorityAwareGarbageCollectionNonSecure) {
-  TestPriorityAwareGarbageCollectHelperNonSecure();
-}
-
-TEST_F(CookieMonsterTest, TestPriorityAwareGarbageCollectionSecure) {
-  TestPriorityAwareGarbageCollectHelperSecure();
-}
-
-TEST_F(CookieMonsterTest, TestPriorityAwareGarbageCollectionMixed) {
-  TestPriorityAwareGarbageCollectHelperMixed();
+TEST_F(CookieMonsterTest, TestPriorityAwareGarbageCollection) {
+  TestPriorityAwareGarbageCollectHelper();
 }
 
 TEST_F(CookieMonsterTest, SetCookieableSchemes) {
   scoped_refptr<CookieMonster> cm(new CookieMonster(NULL, NULL));
   scoped_refptr<CookieMonster> cm_foo(new CookieMonster(NULL, NULL));
 
   // Only cm_foo should allow foo:// cookies.
   std::vector<std::string> schemes;
   schemes.push_back("foo");
   cm_foo->SetCookieableSchemes(schemes);
@@ skipping 1692 matching lines @@
   DCHECK_EQ(180U, CookieMonster::kDomainMaxCookies);
   DCHECK_EQ(150U, CookieMonster::kDomainMaxCookies -
                       CookieMonster::kDomainPurgeCookies);
   DCHECK_EQ(3300U, CookieMonster::kMaxCookies);
   DCHECK_EQ(30, CookieMonster::kSafeFromGlobalPurgeDays);
 
   // If secure cookies for one domain hit the per domain limit (180), a
   // non-secure cookie will not evict them (and, in fact, the non-secure cookie
   // will be removed right after creation).
   const CookiesEntry test1[] = {{180U, true}, {1U, false}};
-  TestSecureCookieEviction(test1, arraysize(test1), 150U, 0U, nullptr);
+  TestSecureCookieEviction(test1, arraysize(test1), 180U, 0U, nullptr);
 
   // If non-secure cookies for one domain hit the per domain limit (180), the
-  // creation of secure cookies will evict the non-secure cookies first, making
-  // room for the secure cookies.
+  // creation of secure cookies will evict all of the non-secure cookies, and
+  // the secure cookies will still be created.
   const CookiesEntry test2[] = {{180U, false}, {20U, true}};
-  TestSecureCookieEviction(test2, arraysize(test2), 20U, 149U, nullptr);
+  TestSecureCookieEviction(test2, arraysize(test2), 20U, 0U, nullptr);
 
   // If secure cookies for one domain go past the per domain limit (180), they
   // will be evicted as normal by the per domain purge amount (30) down to a
   // lower amount (150), and then will continue to create the remaining cookies
   // (19 more to 169).
   const CookiesEntry test3[] = {{200U, true}};
   TestSecureCookieEviction(test3, arraysize(test3), 169U, 0U, nullptr);
 
   // If a non-secure cookie is created, and a number of secure cookies exceeds
   // the per domain limit (18), the total cookies will be evicted down to a
   // lower amount (150), enforcing the eviction of the non-secure cookie, and
-  // the remaining secure cookies will be created (another 19 to 169).
+  // the remaining secure cookies will be created (another 18 to 168).
   const CookiesEntry test4[] = {{1U, false}, {199U, true}};
-  TestSecureCookieEviction(test4, arraysize(test4), 169U, 0U, nullptr);
+  TestSecureCookieEviction(test4, arraysize(test4), 168U, 0U, nullptr);
 
   // If an even number of non-secure and secure cookies are created below the
   // per-domain limit (180), all will be created and none evicted.
   const CookiesEntry test5[] = {{75U, false}, {75U, true}};
   TestSecureCookieEviction(test5, arraysize(test5), 75U, 75U, nullptr);
 
   // If the same number of secure and non-secure cookies are created (50 each)
   // below the per domain limit (180), and then another set of secure cookies
-  // are created to bring the total above the per-domain limit, all secure
-  // cookies will be retained, and the non-secure cookies will be culled down
-  // to the limit.
+  // are created to bring the total above the per-domain limit, all of the
+  // non-secure cookies will be evicted but none of the secure ones will be
+  // evicted.
   const CookiesEntry test6[] = {{50U, true}, {50U, false}, {81U, true}};
-  TestSecureCookieEviction(test6, arraysize(test6), 131U, 19U, nullptr);
+  TestSecureCookieEviction(test6, arraysize(test6), 131U, 0U, nullptr);
 
   // If the same number of non-secure and secure cookies are created (50 each)
   // below the per domain limit (180), and then another set of non-secure
-  // cookies are created to bring the total above the per-domain limit, all
-  // secure cookies will be retained, and the non-secure cookies will be culled
-  // down to the limit.
+  // cookies are created to bring the total above the per-domain limit, all of
+  // the non-secure cookies will be evicted but none of the secure ones will be
+  // evicted.
   const CookiesEntry test7[] = {{50U, false}, {50U, true}, {81U, false}};
-  TestSecureCookieEviction(test7, arraysize(test7), 50U, 100U, nullptr);
+  TestSecureCookieEviction(test7, arraysize(test7), 50U, 0U, nullptr);
 
   // If the same number of non-secure and secure cookies are created (50 each)
   // below the per domain limit (180), and then another set of non-secure
-  // cookies are created to bring the total above the per-domain limit, all
-  // secure cookies will be retained, and the non-secure cookies will be culled
-  // down to the limit, then the remaining non-secure cookies will be created
-  // (9).
+  // cookies are created to bring the total above the per-domain limit, all of
+  // the non-secure cookies will be evicted but none of the secure ones will be
+  // evicted, and then the remaining non-secure cookies will be created (9).
   const CookiesEntry test8[] = {{50U, false}, {50U, true}, {90U, false}};
-  TestSecureCookieEviction(test8, arraysize(test8), 50U, 109U, nullptr);
+  TestSecureCookieEviction(test8, arraysize(test8), 50U, 9U, nullptr);
 
   // If a number of non-secure cookies are created on other hosts (20) and are
   // past the global 'safe' date, and then the number of non-secure cookies for
   // a single domain are brought to the per-domain limit (180), followed by
-  // another set of secure cookies on that same domain (20), all the secure
-  // cookies for that domain should be retained, while the non-secure should be
-  // culled down to the per-domain limit. The non-secure cookies for other
-  // domains should remain untouched.
+  // another set of secure cookies on that same domain (20), all of the
+  // non-secure cookies for that domain should be evicted, but the non-secure
+  // cookies for other domains should remain, as should the secure cookies for
+  // that domain.
   const CookiesEntry test9[] = {{180U, false}, {20U, true}};
   const AltHosts test9_alt_hosts(0, 20);
-  TestSecureCookieEviction(test9, arraysize(test9), 20U, 169U,
-                           &test9_alt_hosts);
+  TestSecureCookieEviction(test9, arraysize(test9), 20U, 20U, &test9_alt_hosts);
 
   // If a number of secure cookies are created on other hosts and hit the global
   // cookie limit (3300) and are past the global 'safe' date, and then a single
   // non-secure cookie is created now, the secure cookies are removed so that
   // the global total number of cookies is at the global purge goal (3000), but
   // the non-secure cookie is not evicted since it is too young.
   const CookiesEntry test10[] = {{1U, false}};
   const AltHosts test10_alt_hosts(3300, 0);
   TestSecureCookieEviction(test10, arraysize(test10), 2999U, 1U,
                            &test10_alt_hosts);
@@ skipping 287 matching lines @@
       monster()->AddCallbackForCookie(
           test_url_, "abc",
           base::Bind(&RecordCookieChanges, &cookies1, nullptr)));
   SetCookie(monster(), test_url_, "abc=def");
   base::MessageLoop::current()->RunUntilIdle();
   EXPECT_EQ(1U, cookies0.size());
   EXPECT_EQ(1U, cookies0.size());
 }
 
 }  // namespace net