Don't maintain a second level of timeouts.

net/ssl/ssl_client_session_cache.cc

 // Copyright 2015 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/ssl/ssl_client_session_cache.h"
 
 #include <utility>
 
 #include "base/memory/memory_coordinator_client_registry.h"
 #include "base/time/clock.h"
@@ skipping 25 matching lines @@
     const std::string& cache_key) {
   base::AutoLock lock(lock_);
 
   // Expire stale sessions.
   lookups_since_flush_++;
   if (lookups_since_flush_ >= config_.expiration_check_count) {
     lookups_since_flush_ = 0;
     FlushExpiredSessions();
   }
 
-  CacheEntryMap::iterator iter = cache_.Get(cache_key);
+  auto iter = cache_.Get(cache_key);
   if (iter == cache_.end())
     return nullptr;
-  if (IsExpired(iter->second.get(), clock_->Now())) {
+
+  SSL_SESSION* session = iter->second.get();
+  if (IsExpired(session, clock_->Now().ToTimeT())) {
     cache_.Erase(iter);
     return nullptr;
   }
 
-  SSL_SESSION* session = iter->second->session.get();
   SSL_SESSION_up_ref(session);
   return bssl::UniquePtr<SSL_SESSION>(session);
 }
 
 void SSLClientSessionCache::Insert(const std::string& cache_key,
                                    SSL_SESSION* session) {
   base::AutoLock lock(lock_);
 
-  // Make a new entry.
-  std::unique_ptr<CacheEntry> entry(new CacheEntry);
   SSL_SESSION_up_ref(session);
-  entry->session.reset(session);
-  entry->creation_time = clock_->Now();
-
-  // Takes ownership.
-  cache_.Put(cache_key, std::move(entry));
+  cache_.Put(cache_key, bssl::UniquePtr<SSL_SESSION>(session));
 }
 
 void SSLClientSessionCache::Flush() {
   base::AutoLock lock(lock_);
 
   cache_.Clear();
 }
 
 void SSLClientSessionCache::SetClockForTesting(
     std::unique_ptr<base::Clock> clock) {
   clock_ = std::move(clock);
 }
 
-SSLClientSessionCache::CacheEntry::CacheEntry() {}
-
-SSLClientSessionCache::CacheEntry::~CacheEntry() {}
-
-bool SSLClientSessionCache::IsExpired(SSLClientSessionCache::CacheEntry* entry,
-                                      const base::Time& now) {
-  return now < entry->creation_time ||
-         entry->creation_time + config_.timeout < now;
+bool SSLClientSessionCache::IsExpired(SSL_SESSION* session, time_t now) {
+  return now < SSL_SESSION_get_time(session) ||
+         now >=
+             SSL_SESSION_get_time(session) + SSL_SESSION_get_timeout(session);
 }
 
 void SSLClientSessionCache::FlushExpiredSessions() {
-  base::Time now = clock_->Now();
-  CacheEntryMap::iterator iter = cache_.begin();
+  time_t now = clock_->Now().ToTimeT();
+  auto iter = cache_.begin();
   while (iter != cache_.end()) {
     if (IsExpired(iter->second.get(), now)) {
       iter = cache_.Erase(iter);
     } else {
       ++iter;
     }
   }
 }
 
 void SSLClientSessionCache::OnMemoryPressure(
@@ skipping 22 matching lines @@
       break;
     case base::MemoryState::SUSPENDED:
     // Note: Not supported at present. Fall through.
     case base::MemoryState::UNKNOWN:
       NOTREACHED();
       break;
   }
 }
 
 }  // namespace net