Adding DiskBasedCertCache to HttpCache (+UMA).

net/http/http_cache.h

Index: net/http/http_cache.h
diff --git a/net/http/http_cache.h b/net/http/http_cache.h
index 752b98a6715b0f9c66030d4a9e143fb90d9b522e..0d8a3f0dcd2d6ba2f29aef888f904a8fdaff217f 100644
--- a/net/http/http_cache.h
+++ b/net/http/http_cache.h
@@ -31,6 +31,7 @@
 #include "net/base/load_states.h"
 #include "net/base/net_export.h"
 #include "net/base/request_priority.h"
+#include "net/http/disk_based_cert_cache.h"

[Ryan Sleevi, 2014/06/26 19:56:02]

Don't include this header in the .h.

You can forward declare the class, and then include the .h in the .cc

 #include "net/http/http_network_session.h"
 #include "net/http/http_transaction_factory.h"
 
@@ -201,6 +202,10 @@ class NET_EXPORT HttpCache : public HttpTransactionFactory,
 
   base::WeakPtr<HttpCache> GetWeakPtr() { return weak_factory_.GetWeakPtr(); }
 
+  DiskBasedCertCache* CertCache() {

[Ryan Sleevi, 2014/06/26 19:56:02]

1) This should be const
2) You should place it with the rest of the functions associated with this
class, rather than after the inherited classes (we try to group 'this class' /
'other classes' separately)

I suspect this should be around line 145

+    return cert_cache_.get();
+  }
+
   // Resets the network layer to allow for tests that probe
   // network changes (e.g. host unreachable).  The old network layer is
   // returned to allow for filter patterns that only intercept
@@ -405,6 +410,8 @@ class NET_EXPORT HttpCache : public HttpTransactionFactory,
 
   scoped_ptr<disk_cache::Backend> disk_cache_;
 
+  scoped_ptr<DiskBasedCertCache> cert_cache_;
+
   // The set of active entries indexed by cache key.
   ActiveEntriesMap active_entries_;