Moves SQLitePersistentCookieStore to net/extras/sqlite.

net/extras/sqlite/sqlite_persistent_cookie_store.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // 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 <string>
 #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;
 
 namespace base {
 class FilePath;
 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 SQLitePersistentCookieStore
+    : public CookieMonster::PersistentCookieStore {
  public:
   // All blocking database accesses will be performed on
   // |background_task_runner|, while |client_task_runner| is used to invoke
   // callbacks.
   SQLitePersistentCookieStore(
       const base::FilePath& path,
       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:
+  // Contains the origin and a bool indicating whether or not the
+  // origin is secure.
+  typedef std::pair<std::string, bool> CookieOrigin;

[Ryan Sleevi, 2015/05/06 00:44:19]

http://google-styleguide.googlecode.com/svn/trunk/cppguide.html#Declaration_O...

[rohitrao (ping after 24h), 2015/05/11 19:25:30]

Done.

+
+  // Deletes all of the cookies in |cookies|.

[Ryan Sleevi, 2015/05/06 00:44:19]

This comment needs rewording, since an "std::list<CookieOrigin>&" is not "all of
the cookies"

[rohitrao (ping after 24h), 2015/05/11 19:25:30]

Done.

+  void DeleteAllInList(const std::list<CookieOrigin>& cookies);

[Ryan Sleevi, 2015/05/06 00:44:18]

DESIGN: It's not clear why this uses a std::list. Any reason?

In particular, it seems like duplicate CookieOrigins can get inserted here.
Would this make more sense as a map of origin/bool pairs? Why or why not?

[Later follow-up] It seems like duplicates are desired, so you can delete both
secure and non-secure cookies. Still, it may result in duplication. I'm
wondering whether map<origin, enum> makes more sense?

[rohitrao (ping after 24h), 2015/05/11 19:25:30]

I picked std::list because that's what QuotaPolicyChannelIDStore uses. 
Duplication doesn't bother me all that much, because there's no ambiguity about
what to do when duplicates are present.  I would be fine with using std::set
instead (hash_set or unordered_set?), to remove the possibility of duplicates. 
I don't think I like map<origin,enum>.

[Ryan Sleevi, 2015/05/12 00:48:33]

Right, but it doesn't seem we need to use the same structure. That is, QPCIDS
(oof) ISTR needed to be able to quickly insert/delete elements, hence the list.
It may be that the list is now entirely overkill.
Agreed, not a terrible fan of the map, even if it's implemented in terms of a
set ;) hash_set doesn't lend itself well (writing a custom hash function), same
w/ unordered_set 

+
+  // 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_;
 
   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_