Move sqlite_channel_id_store from chrome/browser/net to net/extras.

net/extras/sqlite/sqlite_channel_id_store.h

Index: net/extras/sqlite/sqlite_channel_id_store.h
diff --git a/chrome/browser/net/sqlite_channel_id_store.h b/net/extras/sqlite/sqlite_channel_id_store.h
similarity index 54%
rename from chrome/browser/net/sqlite_channel_id_store.h
rename to net/extras/sqlite/sqlite_channel_id_store.h
index 13fe5322556f5368e1fa8c19728b866cf3438562..7516405008586d9870db720f77ec5c390e3f2c6f 100644
--- a/chrome/browser/net/sqlite_channel_id_store.h
+++ b/net/extras/sqlite/sqlite_channel_id_store.h
@@ -2,11 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_NET_SQLITE_CHANNEL_ID_STORE_H_
-#define CHROME_BROWSER_NET_SQLITE_CHANNEL_ID_STORE_H_
+#ifndef NET_EXTRAS_SQLITE_SQLITE_CHANNEL_ID_STORE_H_
+#define NET_EXTRAS_SQLITE_SQLITE_CHANNEL_ID_STORE_H_
 
 #include "base/callback_forward.h"
 #include "base/compiler_specific.h"
+#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "net/ssl/default_channel_id_store.h"
 
@@ -15,36 +16,33 @@ class FilePath;
 class SequencedTaskRunner;
 }
 
-namespace quota {
-class SpecialStoragePolicy;
-}
+class GURL;
+
+namespace net {
 
-// Implements the net::DefaultChannelIDStore::PersistentStore interface
+// Implements the DefaultChannelIDStore::PersistentStore interface
 // in terms of a SQLite database. For documentation about the actual member
 // functions consult the documentation of the parent class
-// |net::DefaultChannelIDStore::PersistentCertStore|.
-// If provided, a |SpecialStoragePolicy| is consulted when the SQLite database
-// is closed to decide which certificates to keep.
-class SQLiteChannelIDStore
-    : public net::DefaultChannelIDStore::PersistentStore {
+// DefaultChannelIDStore::PersistentCertStore.
+class SQLiteChannelIDStore : public DefaultChannelIDStore::PersistentStore {
  public:
+  // Create or open persistent store in file |path|. All I/O tasks are performed
+  // in background using |background_task_runner|.
   SQLiteChannelIDStore(
       const base::FilePath& path,
-      const scoped_refptr<base::SequencedTaskRunner>& background_task_runner,
-      quota::SpecialStoragePolicy* special_storage_policy);
+      const scoped_refptr<base::SequencedTaskRunner>& background_task_runner);
 
-  // net::DefaultChannelIDStore::PersistentStore:
+  // DefaultChannelIDStore::PersistentStore:
   virtual void Load(const LoadedCallback& loaded_callback) OVERRIDE;
   virtual void AddChannelID(
-      const net::DefaultChannelIDStore::ChannelID& channel_id) OVERRIDE;
+      const DefaultChannelIDStore::ChannelID& channel_id) OVERRIDE;
   virtual void DeleteChannelID(
-      const net::DefaultChannelIDStore::ChannelID& channel_idx) OVERRIDE;
+      const DefaultChannelIDStore::ChannelID& channel_idx) OVERRIDE;

[Ryan Sleevi, 2014/08/07 22:00:22]

Worth noting that these two parameters have different names. Is one an ID and
one an index?

[mef, 2014/08/08 17:48:36]

Nope, both are ChannelID, seems like a spurious x.

   virtual void SetForceKeepSessionState() OVERRIDE;
 
- protected:
+ private:
   virtual ~SQLiteChannelIDStore();
 
- private:
   class Backend;
 
   scoped_refptr<Backend> backend_;
@@ -52,4 +50,6 @@ class SQLiteChannelIDStore
   DISALLOW_COPY_AND_ASSIGN(SQLiteChannelIDStore);
 };
 
-#endif  // CHROME_BROWSER_NET_SQLITE_CHANNEL_ID_STORE_H_
+}  // namespace net
+
+#endif  // NET_EXTRAS_SQLITE_SQLITE_CHANNEL_ID_STORE_H_