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

content/browser/net/quota_policy_channel_id_store.h

Index: content/browser/net/quota_policy_channel_id_store.h
diff --git a/content/browser/net/quota_policy_channel_id_store.h b/content/browser/net/quota_policy_channel_id_store.h
new file mode 100644
index 0000000000000000000000000000000000000000..f654d4da691c5878ee22164801cbba03a1aa9901
--- /dev/null
+++ b/content/browser/net/quota_policy_channel_id_store.h
@@ -0,0 +1,75 @@
+// Copyright (c) 2014 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.
+
+#ifndef CONTENT_BROWSER_NET_QUOTA_POLICY_CHANNEL_ID_STORE_H_
+#define CONTENT_BROWSER_NET_QUOTA_POLICY_CHANNEL_ID_STORE_H_
+
+#include <set>
+#include <string>
+#include <vector>
+
+#include "base/callback_forward.h"
+#include "base/compiler_specific.h"
+#include "base/memory/ref_counted.h"
+#include "base/memory/scoped_ptr.h"
+#include "base/memory/scoped_vector.h"
+#include "content/common/content_export.h"
+#include "net/extras/sqlite/sqlite_channel_id_store.h"
+
+namespace base {
+class FilePath;
+class SequencedTaskRunner;
+}
+
+namespace quota {
+class SpecialStoragePolicy;
+}
+
+namespace content {
+
+// Persistent ChannelID Store that takes into account SpecialStoragePolicy and
+// removes ChannelIDs that are StorageSessionOnly when store is closed.
+class CONTENT_EXPORT QuotaPolicyChannelIDStore
+    : public net::DefaultChannelIDStore::PersistentStore {

[erikwright (departed), 2014/08/12 19:48:09]

Shouldn't you include "net/ssl/default_channel_id_store.h"?

[mef, 2014/08/12 20:36:53]

Done.

+ public:
+  // Create or open persistent store in file |path|. All I/O tasks are performed
+  // in background using |background_task_runner|. If provided, a
+  // |special_storage_policy| is consulted when the store is closed to decide
+  // which certificates to keep.
+  QuotaPolicyChannelIDStore(
+      const base::FilePath& path,
+      const scoped_refptr<base::SequencedTaskRunner>& background_task_runner,
+      quota::SpecialStoragePolicy* special_storage_policy);
+
+  // net::DefaultChannelIDStore::PersistentStore:
+  virtual void Load(const LoadedCallback& loaded_callback) OVERRIDE;
+  virtual void AddChannelID(
+      const net::DefaultChannelIDStore::ChannelID& channel_id) OVERRIDE;
+  virtual void DeleteChannelID(
+      const net::DefaultChannelIDStore::ChannelID& channel_id) OVERRIDE;
+  virtual void SetForceKeepSessionState() OVERRIDE;
+
+ private:
+  typedef ScopedVector<net::DefaultChannelIDStore::ChannelID> ChannelIDVector;
+
+  virtual ~QuotaPolicyChannelIDStore();
+
+  void OnLoad(const LoadedCallback& loaded_callback,
+              scoped_ptr<ChannelIDVector> channel_ids);
+
+  // True if everything should go to persistent store.
+  bool force_keep_session_state_;
+  const base::FilePath& path_;
+  scoped_refptr<base::SequencedTaskRunner> background_task_runner_;
+  scoped_refptr<quota::SpecialStoragePolicy> special_storage_policy_;
+  scoped_refptr<net::SQLiteChannelIDStore> persistent_store_;
+  // Cache of server identifiers we have channel IDs stored for.
+  std::set<std::string> server_identifiers_;
+
+  DISALLOW_COPY_AND_ASSIGN(QuotaPolicyChannelIDStore);
+};
+
+}  // namespace content
+
+#endif  // CONTENT_BROWSER_NET_QUOTA_POLICY_CHANNEL_ID_STORE_H_