Adding DiskBasedCertCache to HttpCache (+UMA).

net/http/http_cache.h

 // 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.
 
 // This file declares a HttpTransactionFactory implementation that can be
 // layered on top of another HttpTransactionFactory to add HTTP caching.  The
 // caching logic follows RFC 2616 (any exceptions are called out in the code).
 //
 // The HttpCache takes a disk_cache::Backend as a parameter, and uses that for
 // the cache storage.
@@ skipping 26 matching lines @@
 class GURL;
 
 namespace disk_cache {
 class Backend;
 class Entry;
 }
 
 namespace net {
 
 class CertVerifier;
+class DiskBasedCertCache;
 class HostResolver;
 class HttpAuthHandlerFactory;
 class HttpNetworkSession;
 class HttpResponseInfo;
 class HttpServerProperties;
 class IOBuffer;
 class NetLog;
 class NetworkDelegate;
 class ServerBoundCertService;
 class ProxyService;
@@ skipping 78 matching lines @@
   // |network_layer| and |backend_factory| are managed by the HttpCache and
   // will be destroyed using |delete| when the HttpCache is destroyed.
   HttpCache(HttpTransactionFactory* network_layer,
             NetLog* net_log,
             BackendFactory* backend_factory);
 
   virtual ~HttpCache();
 
   HttpTransactionFactory* network_layer() { return network_layer_.get(); }
 
+  DiskBasedCertCache* cert_cache() const { return cert_cache_.get(); }
+
   // Retrieves the cache backend for this HttpCache instance. If the backend
   // is not initialized yet, this method will initialize it. The return value is
   // a network error code, and it could be ERR_IO_PENDING, in which case the
   // |callback| will be notified when the operation completes. The pointer that
   // receives the |backend| must remain valid until the operation completes.
   int GetBackend(disk_cache::Backend** backend,
                  const net::CompletionCallback& callback);
 
   // Returns the current backend (can be NULL).
   disk_cache::Backend* GetCurrentBackend() const;
@@ skipping 243 matching lines @@
   bool bypass_lock_for_test_;
 
   Mode mode_;
 
   scoped_ptr<QuicServerInfoFactoryAdaptor> quic_server_info_factory_;
 
   scoped_ptr<HttpTransactionFactory> network_layer_;
 
   scoped_ptr<disk_cache::Backend> disk_cache_;
 
+  scoped_ptr<DiskBasedCertCache> cert_cache_;
+
   // The set of active entries indexed by cache key.
   ActiveEntriesMap active_entries_;
 
   // The set of doomed entries.
   ActiveEntriesSet doomed_entries_;
 
   // The set of entries "under construction".
   PendingOpsMap pending_ops_;
 
   scoped_ptr<PlaybackCacheMap> playback_cache_map_;
 
   base::WeakPtrFactory<HttpCache> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(HttpCache);
 };
 
 }  // namespace net
 
 #endif  // NET_HTTP_HTTP_CACHE_H_