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 "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)
+    : path_(path),

[erikwright (departed), 2014/08/12 20:56:11]

why is this member needed?

[mef, 2014/08/12 21:11:23]

Done.

+      background_task_runner_(background_task_runner),

[erikwright (departed), 2014/08/12 20:56:12]

also not needed

[mef, 2014/08/12 21:11:23]

Done.

+      special_storage_policy_(special_storage_policy),
+      persistent_store_(

[erikwright (departed), 2014/08/12 20:56:12]

Consider accepting a DefaultChannelIDStore::PersistentStore to delegate to
rather than accepting the constructor parameters and hardcoding the
implementation class.

This would simplify this class and make it easier to test (if you chose, you
could have a dumb in-memory single-threaded backing store rather than having to
verify round-trips to disk, deal with message loops, etc). Cost is that the
caller needs to explicitly reference SQLiteChannelIDStore, but that seems
reasonable to me.

[mef, 2014/08/12 21:11:22]

Ack. The patchset #17 (https://codereview.chromium.org/381073002/#ps320001)
added DeleteAll method to PersistentStore interface, but per discussion with
sleevi@ (see message #27) I removed it from the interface, so now it only works
with SQLiteChannelIDStore. 
I think it is fine as we can refactor it if needed in the future, but please let
me know if you feel strongly about it.

[erikwright (departed), 2014/08/13 15:49:09]

It's your choice. I think you will remove dozens of lines and much complexity
from the unit test if you add that method to the interface and follow my
recommendation.

+          new net::SQLiteChannelIDStore(path, background_task_runner)) {
+  DCHECK(background_task_runner);
+}
+
+QuotaPolicyChannelIDStore::~QuotaPolicyChannelIDStore() {
+  if (special_storage_policy_.get() &&
+      special_storage_policy_->HasSessionOnlyOrigins()) {

[erikwright (departed), 2014/08/12 20:56:12]

consider reversing the logic and returning early if possible, to decrease
nesting.

[mef, 2014/08/12 21:11:22]

Done.

+    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() {
+  special_storage_policy_ = NULL;
+}
+
+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