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

this is more consistent with how we treat other web site data types

All storage backends except for cookies use the SpecialStoragePolicy to decide what data to delete and what to keep. Also, since they commonly don't have a session only notion, they will delete the data on shutdown.

This CL unifies the way content settings are applied to storage systems by passing a SpecialStoragePolicy to the cookie store backend, and delete cookies on shutdown.

BUG=129349
TEST=SQLitePersistentCookieStoreTest.TestSpecialStoragePolicy

Review URL: https://chromiumcodereview.appspot.com/10407124

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@139544 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 9 insertions, 2 deletions

diff --git a/chrome/browser/net/sqlite_persistent_cookie_store.h b/chrome/browser/net/sqlite_persistent_cookie_store.h
index 7d7cf95..235bcf0 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;