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

content/browser/net/quota_policy_channel_id_store.cc

+// Copyright 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.
+
+#include "content/browser/net/quota_policy_channel_id_store.h"
+
+#include <list>
+#include <set>

[mmenke, 2014/08/12 19:58:40]

nit:  set included in header, so not needed here.

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

Done.

+
+#include "base/basictypes.h"
+#include "base/bind.h"
+#include "base/file_util.h"
+#include "base/files/file_path.h"
+#include "base/logging.h"
+#include "base/metrics/histogram.h"
+#include "base/strings/string_util.h"
+#include "base/threading/thread.h"
+#include "base/threading/thread_restrictions.h"
+#include "net/cookies/cookie_util.h"
+#include "net/extras/sqlite/sqlite_channel_id_store.h"
+#include "url/gurl.h"
+#include "webkit/browser/quota/special_storage_policy.h"
+
+namespace content {
+
+QuotaPolicyChannelIDStore::QuotaPolicyChannelIDStore(
+    const base::FilePath& path,
+    const scoped_refptr<base::SequencedTaskRunner>& background_task_runner,
+    quota::SpecialStoragePolicy* special_storage_policy)
+    : force_keep_session_state_(false),
+      path_(path),
+      background_task_runner_(background_task_runner),
+      special_storage_policy_(special_storage_policy),
+      persistent_store_(
+          new net::SQLiteChannelIDStore(path, background_task_runner)) {
+  DCHECK(background_task_runner);
+}
+
+QuotaPolicyChannelIDStore::~QuotaPolicyChannelIDStore() {
+  if (!force_keep_session_state_ && special_storage_policy_.get() &&
+      special_storage_policy_->HasSessionOnlyOrigins()) {
+    std::list<std::string> session_only_server_identifiers;
+    for (std::set<std::string>::iterator it = server_identifiers_.begin();
+         it != server_identifiers_.end();
+         ++it) {
+      GURL url(net::cookie_util::CookieOriginToURL(*it, true));
+      if (special_storage_policy_->IsStorageSessionOnly(url))
+        session_only_server_identifiers.push_back(*it);
+    }
+    persistent_store_->DeleteAllInList(session_only_server_identifiers);
+  }
+}
+
+void QuotaPolicyChannelIDStore::Load(const LoadedCallback& loaded_callback) {
+  persistent_store_->Load(
+      base::Bind(&QuotaPolicyChannelIDStore::OnLoad, this, loaded_callback));
+}
+
+void QuotaPolicyChannelIDStore::AddChannelID(
+    const net::DefaultChannelIDStore::ChannelID& channel_id) {
+  server_identifiers_.insert(channel_id.server_identifier());
+  persistent_store_->AddChannelID(channel_id);
+}
+
+void QuotaPolicyChannelIDStore::DeleteChannelID(
+    const net::DefaultChannelIDStore::ChannelID& channel_id) {
+  server_identifiers_.erase(channel_id.server_identifier());
+  persistent_store_->DeleteChannelID(channel_id);
+}
+
+void QuotaPolicyChannelIDStore::SetForceKeepSessionState() {
+  force_keep_session_state_ = true;

[mmenke, 2014/08/12 19:58:40]

Doe sit make more sense just to clear the special_storage_policy_, instead of
adding a bool for this?  I'm fine with the bool, just wondering if it's needed.

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

Done. It was moved from original code.

+}
+
+void QuotaPolicyChannelIDStore::OnLoad(
+    const LoadedCallback& loaded_callback,
+    scoped_ptr<ChannelIDVector> channel_ids) {
+  for (ChannelIDVector::const_iterator channel_id = channel_ids->begin();
+       channel_id != channel_ids->end();
+       ++channel_id) {
+    server_identifiers_.insert((*channel_id)->server_identifier());
+  }
+  loaded_callback.Run(channel_ids.Pass());
+}
+
+}  // namespace content