Consider the verification time as well as the expiration time when caching certificate verification…

net/base/expiring_cache_unittest.cc

Index: net/base/expiring_cache_unittest.cc
diff --git a/net/base/expiring_cache_unittest.cc b/net/base/expiring_cache_unittest.cc
index 364af81c30f453a80042feff425fb6fcac0c854d..63349dfb55fd05537c112508aeff944a8a6e468a 100644
--- a/net/base/expiring_cache_unittest.cc
+++ b/net/base/expiring_cache_unittest.cc
@@ -32,7 +32,7 @@ TEST(ExpiringCacheTest, Basic) {
 
   // Add an entry at t=0
   EXPECT_FALSE(cache.Get("entry1", now));
-  cache.Put("entry1", "test1", now, kTTL);
+  cache.Put("entry1", "test1", now, now + kTTL);
   EXPECT_THAT(cache.Get("entry1", now), Pointee(StrEq("test1")));
   EXPECT_EQ(1U, cache.size());
 
@@ -41,7 +41,7 @@ TEST(ExpiringCacheTest, Basic) {
 
   // Add an entry at t=5.
   EXPECT_FALSE(cache.Get("entry2", now));
-  cache.Put("entry2", "test2", now, kTTL);
+  cache.Put("entry2", "test2", now, now + kTTL);
   EXPECT_THAT(cache.Get("entry2", now), Pointee(StrEq("test2")));
   EXPECT_EQ(2U, cache.size());
 
@@ -62,7 +62,7 @@ TEST(ExpiringCacheTest, Basic) {
   EXPECT_EQ(1U, cache.size());
 
   // Update entry1 so it is no longer expired.
-  cache.Put("entry1", "test1", now, kTTL);
+  cache.Put("entry1", "test1", now, now + kTTL);
 
   // Both entries should be retrievable and usable.
   EXPECT_EQ(2U, cache.size());
@@ -85,25 +85,25 @@ TEST(ExpiringCacheTest, Compact) {
   base::TimeTicks now;
   EXPECT_EQ(0U, cache.size());
 
-  // Add five valid entries at t=10.
+  // Add five valid entries at t=10 that expire at t=20.
   base::TimeTicks t10 = now + kTTL;
   for (int i = 0; i < 5; ++i) {
     std::string name = base::StringPrintf("valid%d", i);
-    cache.Put(name, "I'm valid!", t10, kTTL);  // Expire at t=20.
+    cache.Put(name, "I'm valid!", t10, t10 + kTTL);
   }
   EXPECT_EQ(5U, cache.size());
 
-  // Add three expired entries at t=10.
+  // Add three entries at t=0 that expire at t=10.
   for (int i = 0; i < 3; ++i) {
     std::string name = base::StringPrintf("expired%d", i);
-    cache.Put(name, "I'm expired.", now - kTTL, kTTL);  // Expire at t=10.
+    cache.Put(name, "I'm expired.", now, t10);
   }
   EXPECT_EQ(8U, cache.size());
 
-  // Add two negative (instantly expired) entriies at t=10.
+  // Add two negative (instantly expired) entries at t=0 that expire at t=0.
   for (int i = 0; i < 2; ++i) {
     std::string name = base::StringPrintf("negative%d", i);
-    cache.Put(name, "I was never valid.", now, base::TimeDelta::FromSeconds(0));
+    cache.Put(name, "I was never valid.", now, now);
   }
   EXPECT_EQ(10U, cache.size());
 
@@ -151,9 +151,9 @@ TEST(ExpiringCacheTest, SetWithCompact) {
   // t=10
   base::TimeTicks now = base::TimeTicks() + kTTL;
 
-  cache.Put("test1", "test1", now, kTTL);
-  cache.Put("test2", "test2", now, kTTL);
-  cache.Put("expired", "expired", now, base::TimeDelta::FromSeconds(0));
+  cache.Put("test1", "test1", now, now + kTTL);
+  cache.Put("test2", "test2", now, now + kTTL);
+  cache.Put("expired", "expired", now, now);
 
   EXPECT_EQ(3U, cache.size());
 
@@ -163,7 +163,7 @@ TEST(ExpiringCacheTest, SetWithCompact) {
   EXPECT_FALSE(cache.Get("expired", now));
 
   // Adding the fourth entry will cause "expired" to be evicted.
-  cache.Put("test3", "test3", now, kTTL);
+  cache.Put("test3", "test3", now, now + kTTL);
   EXPECT_EQ(3U, cache.size());
 
   EXPECT_FALSE(cache.Get("expired", now));
@@ -173,9 +173,9 @@ TEST(ExpiringCacheTest, SetWithCompact) {
 
   // Add two more entries. Something should be evicted, however "test5"
   // should definitely be in there (since it was last inserted).
-  cache.Put("test4", "test4", now, kTTL);
+  cache.Put("test4", "test4", now, now + kTTL);
   EXPECT_EQ(3U, cache.size());
-  cache.Put("test5", "test5", now, kTTL);
+  cache.Put("test5", "test5", now, now + kTTL);
   EXPECT_EQ(3U, cache.size());
   EXPECT_THAT(cache.Get("test5", now), Pointee(StrEq("test5")));
 }
@@ -190,9 +190,9 @@ TEST(ExpiringCacheTest, Clear) {
   EXPECT_EQ(0U, cache.size());
 
   // Add three entries.
-  cache.Put("test1", "foo", now, kTTL);
-  cache.Put("test2", "foo", now, kTTL);
-  cache.Put("test3", "foo", now, kTTL);
+  cache.Put("test1", "foo", now, now + kTTL);
+  cache.Put("test2", "foo", now, now + kTTL);
+  cache.Put("test3", "foo", now, now + kTTL);
   EXPECT_EQ(3U, cache.size());
 
   cache.Clear();
@@ -210,9 +210,9 @@ TEST(ExpiringCache, GetTruncatesExpiredEntries) {
   EXPECT_EQ(0U, cache.size());
 
   // Add three entries at t=0.
-  cache.Put("test1", "foo1", now, kTTL);
-  cache.Put("test2", "foo2", now, kTTL);
-  cache.Put("test3", "foo3", now, kTTL);
+  cache.Put("test1", "foo1", now, now + kTTL);
+  cache.Put("test2", "foo2", now, now + kTTL);
+  cache.Put("test3", "foo3", now, now + kTTL);
   EXPECT_EQ(3U, cache.size());
 
   // Ensure the entries were added.
@@ -224,7 +224,7 @@ TEST(ExpiringCache, GetTruncatesExpiredEntries) {
   now += kTTL;
   for (int i = 0; i < 5; ++i) {
     std::string name = base::StringPrintf("valid%d", i);
-    cache.Put(name, name, now, kTTL);  // Expire at t=20.
+    cache.Put(name, name, now, now + kTTL);  // Expire at t=20.
   }
   EXPECT_EQ(8U, cache.size());