Fix CookieMonster garbage collection when no insecure cookies.

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_monster.h"
 
 #include <algorithm>
 #include <memory>
 #include <string>
 #include <vector>
@@ skipping 2197 matching lines @@
 
   for (int ci = 0; ci < static_cast<int>(arraysize(test_cases)); ++ci) {
     const TestCase* test_case = &test_cases[ci];
     std::unique_ptr<CookieMonster> cm = CreateMonsterFromStoreForGC(
         test_case->num_cookies, test_case->num_old_cookies, 0, 0,
         CookieMonster::kSafeFromGlobalPurgeDays * 2);
     EXPECT_EQ(test_case->expected_initial_cookies,
               GetAllCookies(cm.get()).size())
         << "For test case " << ci;
     // Will trigger GC
     SetCookie(cm.get(), GURL("http://newdomain.com"), "b=2");

[mmenke, 2017/06/06 23:19:48]

If this were a secure cookie, this test would have run into the issue, but
figured it was best to make a new test.

     EXPECT_EQ(test_case->expected_cookies_after_set,
               GetAllCookies(cm.get()).size())
         << "For test case " << ci;
   }
 }
 
+// Tests garbage collection when there are only secure cookies.
+// See https://crbug/730000
+TEST_F(CookieMonsterTest, GarbageCollectWithSecureCookiesOnly) {
+  // Create a CookieMonster at its cookie limit. A bit confusing, but the second
+  // number is a subset of the first number.
+  std::unique_ptr<CookieMonster> cm = CreateMonsterFromStoreForGC(
+      CookieMonster::kMaxCookies /* num_secure_cookies */,
+      CookieMonster::kMaxCookies /* num_old_secure_cookies */,
+      0 /* num_non_secure_cookies */, 0 /* num_old_non_secure_cookies */,
+      CookieMonster::kSafeFromGlobalPurgeDays * 2 /* days_old */);
+  EXPECT_EQ(CookieMonster::kMaxCookies, GetAllCookies(cm.get()).size());
+
+  // Trigger purge with a secure cookie (So there are still no insecure
+  // cookies).
+  SetCookie(cm.get(), GURL("https://newdomain.com"), "b=2; Secure");
+  EXPECT_EQ(CookieMonster::kMaxCookies - CookieMonster::kPurgeCookies,
+            GetAllCookies(cm.get()).size());
+}
+
 // Tests that if the main load event happens before the loaded event for a
 // particular key, the tasks for that key run first.
 TEST_F(CookieMonsterTest, WhileLoadingLoadCompletesBeforeKeyLoadCompletes) {
   const GURL kUrl = GURL(kTopLevelDomainPlus1);
 
   scoped_refptr<MockPersistentCookieStore> store(new MockPersistentCookieStore);
   store->set_store_load_commands(true);
   std::unique_ptr<CookieMonster> cm(new CookieMonster(store.get(), nullptr));
 
   // Get all cookies task that queues a task to set a cookie when executed.
@@ skipping 1186 matching lines @@
       monster()->AddCallbackForCookie(
           test_url_, "abc",
           base::Bind(&RecordCookieChanges, &cookies1, nullptr)));
   SetCookie(monster(), test_url_, "abc=def");
   base::RunLoop().RunUntilIdle();
   EXPECT_EQ(1U, cookies0.size());
   EXPECT_EQ(1U, cookies0.size());
 }
 
 }  // namespace net