| Index: net/extras/sqlite/sqlite_persistent_cookie_store.h
|
| diff --git a/content/browser/net/sqlite_persistent_cookie_store.h b/net/extras/sqlite/sqlite_persistent_cookie_store.h
|
| similarity index 61%
|
| rename from content/browser/net/sqlite_persistent_cookie_store.h
|
| rename to net/extras/sqlite/sqlite_persistent_cookie_store.h
|
| index 09835ba6216373e436d6b7ce399b43586815fc3e..46899742d92b81584e0a8f0f84c55520992e59c4 100644
|
| --- a/content/browser/net/sqlite_persistent_cookie_store.h
|
| +++ b/net/extras/sqlite/sqlite_persistent_cookie_store.h
|
| @@ -4,8 +4,8 @@
|
|
|
| // A sqlite implementation of a cookie monster persistent store.
|
|
|
| -#ifndef CONTENT_BROWSER_NET_SQLITE_PERSISTENT_COOKIE_STORE_H_
|
| -#define CONTENT_BROWSER_NET_SQLITE_PERSISTENT_COOKIE_STORE_H_
|
| +#ifndef NET_EXTRAS_SQLITE_SQLITE_PERSISTENT_COOKIE_STORE_H_
|
| +#define NET_EXTRAS_SQLITE_SQLITE_PERSISTENT_COOKIE_STORE_H_
|
|
|
| #include <string>
|
| #include <vector>
|
| @@ -13,7 +13,7 @@
|
| #include "base/callback_forward.h"
|
| #include "base/compiler_specific.h"
|
| #include "base/memory/ref_counted.h"
|
| -#include "content/common/content_export.h"
|
| +#include "net/base/net_export.h"
|
| #include "net/cookies/cookie_monster.h"
|
|
|
| class Task;
|
| @@ -26,21 +26,12 @@ class SequencedTaskRunner;
|
| namespace net {
|
| class CanonicalCookie;
|
| class CookieCryptoDelegate;
|
| -}
|
| -
|
| -namespace storage {
|
| -class SpecialStoragePolicy;
|
| -}
|
| -
|
| -namespace content {
|
|
|
| // 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 |SpecialStoragePolicy| is consulted when the SQLite database
|
| -// is closed to decide which cookies to keep.
|
| -class CONTENT_EXPORT SQLitePersistentCookieStore
|
| - : public net::CookieMonster::PersistentCookieStore {
|
| +// of the parent class |CookieMonster::PersistentCookieStore|.
|
| +class NET_EXPORT SQLitePersistentCookieStore
|
| + : public CookieMonster::PersistentCookieStore {
|
| public:
|
| // All blocking database accesses will be performed on
|
| // |background_task_runner|, while |client_task_runner| is used to invoke
|
| @@ -50,23 +41,26 @@ class CONTENT_EXPORT SQLitePersistentCookieStore
|
| const scoped_refptr<base::SequencedTaskRunner>& client_task_runner,
|
| const scoped_refptr<base::SequencedTaskRunner>& background_task_runner,
|
| bool restore_old_session_cookies,
|
| - storage::SpecialStoragePolicy* special_storage_policy,
|
| - net::CookieCryptoDelegate* crypto_delegate);
|
| + CookieCryptoDelegate* crypto_delegate);
|
|
|
| - // net::CookieMonster::PersistentCookieStore:
|
| + // Deletes all of the cookies in |cookies|.
|
| + typedef std::pair<std::string, bool> CookieOrigin;
|
| + void DeleteAllInList(std::list<CookieOrigin> cookies);
|
| +
|
| + // CookieMonster::PersistentCookieStore:
|
| void Load(const LoadedCallback& loaded_callback) override;
|
| void LoadCookiesForKey(const std::string& key,
|
| const LoadedCallback& callback) override;
|
| - void AddCookie(const net::CanonicalCookie& cc) override;
|
| - void UpdateCookieAccessTime(const net::CanonicalCookie& cc) override;
|
| - void DeleteCookie(const net::CanonicalCookie& cc) override;
|
| + void AddCookie(const CanonicalCookie& cc) override;
|
| + void UpdateCookieAccessTime(const CanonicalCookie& cc) override;
|
| + void DeleteCookie(const CanonicalCookie& cc) override;
|
| void SetForceKeepSessionState() override;
|
| void Flush(const base::Closure& callback) override;
|
|
|
| - protected:
|
| - ~SQLitePersistentCookieStore() override;
|
|
|
| private:
|
| + ~SQLitePersistentCookieStore() override;
|
| +
|
| class Backend;
|
|
|
| scoped_refptr<Backend> backend_;
|
| @@ -74,6 +68,6 @@ class CONTENT_EXPORT SQLitePersistentCookieStore
|
| DISALLOW_COPY_AND_ASSIGN(SQLitePersistentCookieStore);
|
| };
|
|
|
| -} // namespace content
|
| +} // namespace net
|
|
|
| -#endif // CONTENT_BROWSER_NET_SQLITE_PERSISTENT_COOKIE_STORE_H_
|
| +#endif // NET_EXTRAS_SQLITE_SQLITE_PERSISTENT_COOKIE_STORE_H_
|
|
|