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

chrome/browser/net/sqlite_persistent_cookie_store.h

Index: chrome/browser/net/sqlite_persistent_cookie_store.h
diff --git a/chrome/browser/net/sqlite_persistent_cookie_store.h b/chrome/browser/net/sqlite_persistent_cookie_store.h
index 7d7cf95373634f15ae4cc5c506f9f8e1700c18f5..235bcf0933693f383b903dff12ac5f004bda313b 100644
--- a/chrome/browser/net/sqlite_persistent_cookie_store.h
+++ b/chrome/browser/net/sqlite_persistent_cookie_store.h
@@ -16,17 +16,24 @@
 #include "base/memory/ref_counted.h"
 #include "net/cookies/cookie_monster.h"
 
+class ClearOnExitPolicy;
 class FilePath;
 class Task;
 
 // Implements the PersistentCookieStore interface in terms of a SQLite database.
 // For documentation about the actual member functions consult the documentation
 // of the parent class |net::CookieMonster::PersistentCookieStore|.
+// If provided, a |ClearOnExitPolicy| is consulted when the SQLite database is
+// closed to decide which cookies to keep.
 class SQLitePersistentCookieStore
     : public net::CookieMonster::PersistentCookieStore {
  public:
-  SQLitePersistentCookieStore(const FilePath& path,
-                              bool restore_old_session_cookies);
+  // If non-NULL, SQLitePersistentCookieStore will keep a scoped_refptr to the
+  // |clear_on_exit_policy| throughout its lifetime.
+  SQLitePersistentCookieStore(
+      const FilePath& path,
+      bool restore_old_session_cookies,
+      ClearOnExitPolicy* clear_on_exit_policy);
 
   // net::CookieMonster::PersistentCookieStore:
   virtual void Load(const LoadedCallback& loaded_callback) OVERRIDE;