Adding DiskBasedCertCache to HttpCache (+UMA).

net/http/http_cache.cc

Index: net/http/http_cache.cc
diff --git a/net/http/http_cache.cc b/net/http/http_cache.cc
index aa6fc228bc6c91b7cbf31c3fa67145683466695f..2137475ce555f47020eebfeb253e92ac6a4bcb54 100644
--- a/net/http/http_cache.cc
+++ b/net/http/http_cache.cc
@@ -33,6 +33,7 @@
 #include "net/base/net_errors.h"
 #include "net/base/upload_data_stream.h"
 #include "net/disk_cache/disk_cache.h"
+#include "net/http/disk_based_cert_cache.h"
 #include "net/http/disk_cache_based_quic_server_info.h"
 #include "net/http/http_cache_transaction.h"
 #include "net/http/http_network_layer.h"
@@ -45,6 +46,11 @@
 
 namespace {
 
+bool UseCertCache() {

[wtc, 2014/07/08 00:14:03]

IMPORTANT: Should we also use a command-line option to enable this code?

[Ryan Sleevi, 2014/07/08 00:34:18]

wtc: What's the use case here? I discouraged Brandon from doing so, precisely
because I cannot think of a reason.

Please also note that field trials already have a means to force the group.

[wtc, 2014/07/08 01:54:41]

A command-line option is a common way to allow us to check in code that is
incomplete and should be disabled by default. We can certainly accomplish the
same effect by not starting the field trial until this code is complete.

+  return base::FieldTrialList::FindFullName("CertCacheTrial") ==
+         "ExperimentGroup";

[wtc, 2014/07/08 18:24:21]

IMPORTANT: Users in the field trial will have new cert-cache entries (with the
key "cert:<sha1-fingerprint>") in their disk caches. Before we start the field
trial, please resolve these two issues:

1. Find out if we need to provide UI (under chrome://settings > Privacy > Clear
browsing data) to have the cert-cache entries removed. Perhaps the "Cached
images and files" checkbox will take care of this automatically?

2. We may need to version the serialization format so that we can change the
format in the future. Right now the serialization format is simply the
DER-encoded certificate bytes, with no "metadata" such as the format version.

[Ryan Sleevi, 2014/07/08 18:29:08]

Yes. We're using the DiskCache.
The metadata is the URI scheme, "cert:". We can change the URI scheme if we need
to change versions.

[wtc, 2014/07/08 19:00:11]

Suppose we change the URI scheme to "cert2:". Won't that make the entries with
the old URI scheme "cert:" unreachable? It seems better to version the
serialization format because the existing entries can be overwritten with data
in the new format.

+}
+
 // Adaptor to delete a file on a worker thread.
 void DeletePath(base::FilePath path) {
   base::DeleteFile(path, false);
@@ -1174,8 +1180,11 @@ void HttpCache::OnBackendCreated(int result, PendingOp* pending_op) {
     // work items. The first call saves the backend and releases the factory,
     // and the last call clears building_backend_.
     backend_factory_.reset();  // Reclaim memory.
-    if (result == OK)
+    if (result == OK) {
       disk_cache_ = pending_op->backend.Pass();
+      if (UseCertCache())
+        cert_cache_.reset(new DiskBasedCertCache(disk_cache_.get()));
+    }
   }
 
   if (!pending_op->pending_queue.empty()) {