Reland "Moves SQLitePersistentCookieStore to net/extras/sqlite."

net/extras/sqlite/sqlite_persistent_cookie_store.h

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 57%
rename from content/browser/net/sqlite_persistent_cookie_store.h
rename to net/extras/sqlite/sqlite_persistent_cookie_store.h
index 09835ba6216373e436d6b7ce399b43586815fc3e..e29471ae0a23c7add115b6c4cfdca0e3cee48006 100644
--- a/content/browser/net/sqlite_persistent_cookie_store.h
+++ b/net/extras/sqlite/sqlite_persistent_cookie_store.h
@@ -2,18 +2,16 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// 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 <list>
 #include <string>
+#include <utility>
 #include <vector>
 
 #include "base/callback_forward.h"
-#include "base/compiler_specific.h"
 #include "base/memory/ref_counted.h"
-#include "content/common/content_export.h"
 #include "net/cookies/cookie_monster.h"
 
 class Task;
@@ -21,27 +19,22 @@ class Task;
 namespace base {
 class FilePath;
 class SequencedTaskRunner;
-}
+}  // namespace base
 
 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 SQLitePersistentCookieStore
+    : public CookieMonster::PersistentCookieStore {
  public:
+  // Contains the origin and a bool indicating whether or not the
+  // origin is secure.
+  typedef std::pair<std::string, bool> CookieOrigin;
+
   // All blocking database accesses will be performed on
   // |background_task_runner|, while |client_task_runner| is used to invoke
   // callbacks.
@@ -50,23 +43,24 @@ 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 the cookies whose origins match those given in |cookies|.
+  void DeleteAllInList(const 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:
+ private:
   ~SQLitePersistentCookieStore() override;
 
- private:
   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_