Don't force non-session only cookies to be session only cookies, instead delete on shutdown

chrome/browser/net/sqlite_server_bound_cert_store.h

Index: chrome/browser/net/sqlite_server_bound_cert_store.h
diff --git a/chrome/browser/net/sqlite_server_bound_cert_store.h b/chrome/browser/net/sqlite_server_bound_cert_store.h
index 6647eeee3261637c4b412375cb1a4f3f424d50e7..b911c2fddcb036fd8f5173f39161fbc93c437bee 100644
--- a/chrome/browser/net/sqlite_server_bound_cert_store.h
+++ b/chrome/browser/net/sqlite_server_bound_cert_store.h
@@ -11,16 +11,22 @@
 #include "base/memory/ref_counted.h"
 #include "net/base/default_server_bound_cert_store.h"
 
+class ClearOnExitPolicy;
 class FilePath;
 
 // Implements the net::DefaultServerBoundCertStore::PersistentStore interface
 // in terms of a SQLite database. For documentation about the actual member
 // functions consult the documentation of the parent class
 // |net::DefaultServerBoundCertStore::PersistentCertStore|.
+// If provided, a |ClearOnExitPolicy| is consulted when the SQLite database is
+// closed to decide which certificates to keep.
 class SQLiteServerBoundCertStore
     : public net::DefaultServerBoundCertStore::PersistentStore {
  public:
-  explicit SQLiteServerBoundCertStore(const FilePath& path);
+  // If non-NULL, SQLiteServerBoundCertStore will keep a scoped_refptr to the
+  // |clear_on_exit_policy| throughout its lifetime.
+  SQLiteServerBoundCertStore(const FilePath& path,
+                             ClearOnExitPolicy* clear_on_exit_policy);
 
   // net::DefaultServerBoundCertStore::PersistentStore:
   virtual bool Load(