Moves SQLitePersistentCookieStore to net/extras/sqlite.

net/extras/sqlite/sqlite_persistent_cookie_store.cc

 // 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.
 
-#include "content/browser/net/sqlite_persistent_cookie_store.h"
+#include "net/extras/sqlite/sqlite_persistent_cookie_store.h"
 
 #include <list>
 #include <map>
 #include <set>
 #include <utility>
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/metrics/field_trial.h"
 #include "base/metrics/histogram.h"
 #include "base/profiler/scoped_tracker.h"
 #include "base/sequenced_task_runner.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/synchronization/lock.h"
 #include "base/threading/sequenced_worker_pool.h"
 #include "base/time/time.h"
-#include "content/public/browser/browser_thread.h"
-#include "content/public/browser/cookie_store_factory.h"
 #include "net/base/registry_controlled_domains/registry_controlled_domain.h"
 #include "net/cookies/canonical_cookie.h"
 #include "net/cookies/cookie_constants.h"
 #include "net/cookies/cookie_util.h"
 #include "net/extras/sqlite/cookie_crypto_delegate.h"
 #include "sql/error_delegate_util.h"
 #include "sql/meta_table.h"
 #include "sql/statement.h"
 #include "sql/transaction.h"
-#include "storage/browser/quota/special_storage_policy.h"
-#include "third_party/sqlite/sqlite3.h"
 #include "url/gurl.h"
 
 using base::Time;
 
 namespace {
 
 // The persistent cookie store is loaded into memory on eTLD at a time. This
 // variable controls the delay between loading eTLDs, so as to not overload the
 // CPU or I/O with these low priority requests immediately after start up.
 const int kLoadDelayMilliseconds = 0;
 
 }  // namespace
 
-namespace content {
+namespace net {
 
 // This class is designed to be shared between any client thread and the
 // background task runner. It batches operations and commits them on a timer.
 //
 // SQLitePersistentCookieStore::Load is called to load all cookies.  It
 // delegates to Backend::Load, which posts a Backend::LoadAndNotifyOnDBThread
 // task to the background runner.  This task calls Backend::ChainLoadCookies(),
 // which repeatedly posts itself to the BG runner to load each eTLD+1's cookies
 // in separate tasks.  When this is complete, Backend::CompleteLoadOnIOThread is
 // posted to the client runner, which notifies the caller of
@@ skipping 11 matching lines @@
 // disk on the BG runner every 30 seconds, 512 operations, or call to Flush(),
 // whichever occurs first.
 class SQLitePersistentCookieStore::Backend
     : public base::RefCountedThreadSafe<SQLitePersistentCookieStore::Backend> {
  public:
   Backend(
       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)
       : path_(path),
         num_pending_(0),
-        force_keep_session_state_(false),
         initialized_(false),
         corruption_detected_(false),
         restore_old_session_cookies_(restore_old_session_cookies),
-        special_storage_policy_(special_storage_policy),
         num_cookies_read_(0),
         client_task_runner_(client_task_runner),
         background_task_runner_(background_task_runner),
         num_priority_waiting_(0),
         total_priority_requests_(0),
         crypto_(crypto_delegate) {}
 
   // Creates or loads the SQLite database.
   void Load(const LoadedCallback& loaded_callback);
 
   // Loads cookies for the domain key (eTLD+1).
   void LoadCookiesForKey(const std::string& domain,
       const LoadedCallback& loaded_callback);
 
   // Steps through all results of |smt|, makes a cookie from each, and adds the
-  // cookie to |cookies|. This method also updates |cookies_per_origin_| and
-  // |num_cookies_read_|.
-  void MakeCookiesFromSQLStatement(std::vector<net::CanonicalCookie*>* cookies,
+  // cookie to |cookies|. This method also updates |num_cookies_read_|.
+  void MakeCookiesFromSQLStatement(std::vector<CanonicalCookie*>* cookies,
                                    sql::Statement* statement);
 
   // Batch a cookie addition.
-  void AddCookie(const net::CanonicalCookie& cc);
+  void AddCookie(const CanonicalCookie& cc);
 
   // Batch a cookie access time update.
-  void UpdateCookieAccessTime(const net::CanonicalCookie& cc);
+  void UpdateCookieAccessTime(const CanonicalCookie& cc);
 
   // Batch a cookie deletion.
-  void DeleteCookie(const net::CanonicalCookie& cc);
+  void DeleteCookie(const CanonicalCookie& cc);
 
   // Commit pending operations as soon as possible.
   void Flush(const base::Closure& callback);
 
   // Commit any pending operations and close the database.  This must be called
   // before the object is destructed.
   void Close();
 
-  void SetForceKeepSessionState();
+  // Post background delete of all cookies that match |cookies|.
+  void DeleteAllInList(const std::list<CookieOrigin>& cookies);
 
  private:
   friend class base::RefCountedThreadSafe<SQLitePersistentCookieStore::Backend>;
 
   // You should call Close() before destructing this object.
   ~Backend() {
     DCHECK(!db_.get()) << "Close should have already been called.";
-    DCHECK(num_pending_ == 0 && pending_.empty());
+    DCHECK_EQ(0u, num_pending_);
+    DCHECK(pending_.empty());
 
-    for (net::CanonicalCookie* cookie : cookies_) {
+    for (CanonicalCookie* cookie : cookies_) {
       delete cookie;
     }
   }
 
   // Database upgrade statements.
   bool EnsureDatabaseVersion();
 
   class PendingOperation {
    public:
-    typedef enum {
+    enum OperationType {
       COOKIE_ADD,
       COOKIE_UPDATEACCESS,
       COOKIE_DELETE,
-    } OperationType;
+    };
 
-    PendingOperation(OperationType op, const net::CanonicalCookie& cc)
+    PendingOperation(OperationType op, const CanonicalCookie& cc)
         : op_(op), cc_(cc) { }
 
     OperationType op() const { return op_; }
-    const net::CanonicalCookie& cc() const { return cc_; }
+    const CanonicalCookie& cc() const { return cc_; }
 
    private:
     OperationType op_;
-    net::CanonicalCookie cc_;
+    CanonicalCookie cc_;
   };
 
  private:
   // Creates or loads the SQLite database on background runner.
   void LoadAndNotifyInBackground(const LoadedCallback& loaded_callback,
                                  const base::Time& posted_at);
 
   // Loads cookies for the domain key (eTLD+1) on background runner.
   void LoadKeyAndNotifyInBackground(const std::string& domains,
                                     const LoadedCallback& loaded_callback,
@@ skipping 30 matching lines @@
   // Loads cookies for the next domain key from the DB, then either reschedules
   // itself or schedules the provided callback to run on the client runner (if
   // all domains are loaded).
   void ChainLoadCookies(const LoadedCallback& loaded_callback);
 
   // Load all cookies for a set of domains/hosts
   bool LoadCookiesForDomains(const std::set<std::string>& key);
 
   // Batch a cookie operation (add or delete)
   void BatchOperation(PendingOperation::OperationType op,
-                      const net::CanonicalCookie& cc);
+                      const CanonicalCookie& cc);
   // Commit our pending operations to the database.
   void Commit();
   // Close() executed on the background runner.
   void InternalBackgroundClose();
 
   void DeleteSessionCookiesOnStartup();
 
-  void DeleteSessionCookiesOnShutdown();
+  void BackgroundDeleteAllInList(const std::list<CookieOrigin>& cookies);
 
   void DatabaseErrorCallback(int error, sql::Statement* stmt);
   void KillDatabase();
 
   void PostBackgroundTask(const tracked_objects::Location& origin,
                           const base::Closure& task);
   void PostClientTask(const tracked_objects::Location& origin,
                       const base::Closure& task);
 
   // Shared code between the different load strategies to be used after all
   // cookies have been loaded.
   void FinishedLoadingCookies(const LoadedCallback& loaded_callback,
                               bool success);
 
-  base::FilePath path_;
+  const base::FilePath path_;
   scoped_ptr<sql::Connection> db_;
   sql::MetaTable meta_table_;
 
   typedef std::list<PendingOperation*> PendingOperationsList;
   PendingOperationsList pending_;
   PendingOperationsList::size_type num_pending_;
-  // True if the persistent store should skip delete on exit rules.
-  bool force_keep_session_state_;
-  // Guard |cookies_|, |pending_|, |num_pending_|, |force_keep_session_state_|
+  // Guard |cookies_|, |pending_|, |num_pending_|.
   base::Lock lock_;
 
   // Temporary buffer for cookies loaded from DB. Accumulates cookies to reduce
   // the number of messages sent to the client runner. Sent back in response to
   // individual load requests for domain keys or when all loading completes.
   // Ownership of the cookies in this vector is transferred to the client in
   // response to individual load requests or when all loading completes.
-  std::vector<net::CanonicalCookie*> cookies_;
+  std::vector<CanonicalCookie*> cookies_;
 
   // Map of domain keys(eTLD+1) to domains/hosts that are to be loaded from DB.
   std::map<std::string, std::set<std::string> > keys_to_load_;
 
-  // Map of (domain keys(eTLD+1), is secure cookie) to number of cookies in the
-  // database.
-  typedef std::pair<std::string, bool> CookieOrigin;
-  typedef std::map<CookieOrigin, int> CookiesPerOriginMap;
-  CookiesPerOriginMap cookies_per_origin_;
-
   // Indicates if DB has been initialized.
   bool initialized_;
 
   // Indicates if the kill-database callback has been scheduled.
   bool corruption_detected_;
 
   // If false, we should filter out session cookies when reading the DB.
   bool restore_old_session_cookies_;
 
-  // Policy defining what data is deleted on shutdown.
-  scoped_refptr<storage::SpecialStoragePolicy> special_storage_policy_;
-
   // The cumulative time spent loading the cookies on the background runner.
   // Incremented and reported from the background runner.
   base::TimeDelta cookie_load_duration_;
 
   // The total number of cookies read. Incremented and reported on the
   // background runner.
   int num_cookies_read_;
 
   scoped_refptr<base::SequencedTaskRunner> client_task_runner_;
   scoped_refptr<base::SequencedTaskRunner> background_task_runner_;
 
   // Guards the following metrics-related properties (only accessed when
   // starting/completing priority loads or completing the total load).
   base::Lock metrics_lock_;
   int num_priority_waiting_;
   // The total number of priority requests.
   int total_priority_requests_;
   // The time when |num_priority_waiting_| incremented to 1.
   base::Time current_priority_wait_start_;
   // The cumulative duration of time when |num_priority_waiting_| was greater
   // than 1.
   base::TimeDelta priority_wait_duration_;
   // Class with functions that do cryptographic operations (for protecting
   // cookies stored persistently).
   //
   // Not owned.
-  net::CookieCryptoDelegate* crypto_;
+  CookieCryptoDelegate* crypto_;
 
   DISALLOW_COPY_AND_ASSIGN(Backend);
 };
 
 namespace {
 
 // Version number of the database.
 //
 // Version 9 adds a partial index to track non-persistent cookies.
 // Non-persistent cookies sometimes need to be deleted on startup. There are
@@ skipping 28 matching lines @@
 const int kCurrentVersionNumber = 9;
 const int kCompatibleVersionNumber = 5;
 
 // Possible values for the 'priority' column.
 enum DBCookiePriority {
   kCookiePriorityLow = 0,
   kCookiePriorityMedium = 1,
   kCookiePriorityHigh = 2,
 };
 
-DBCookiePriority CookiePriorityToDBCookiePriority(net::CookiePriority value) {
+DBCookiePriority CookiePriorityToDBCookiePriority(CookiePriority value) {
   switch (value) {
-    case net::COOKIE_PRIORITY_LOW:
+    case COOKIE_PRIORITY_LOW:
       return kCookiePriorityLow;
-    case net::COOKIE_PRIORITY_MEDIUM:
+    case COOKIE_PRIORITY_MEDIUM:
       return kCookiePriorityMedium;
-    case net::COOKIE_PRIORITY_HIGH:
+    case COOKIE_PRIORITY_HIGH:
       return kCookiePriorityHigh;
   }
 
   NOTREACHED();
   return kCookiePriorityMedium;
 }
 
-net::CookiePriority DBCookiePriorityToCookiePriority(DBCookiePriority value) {
+CookiePriority DBCookiePriorityToCookiePriority(DBCookiePriority value) {
   switch (value) {
     case kCookiePriorityLow:
-      return net::COOKIE_PRIORITY_LOW;
+      return COOKIE_PRIORITY_LOW;
     case kCookiePriorityMedium:
-      return net::COOKIE_PRIORITY_MEDIUM;
+      return COOKIE_PRIORITY_MEDIUM;
     case kCookiePriorityHigh:
-      return net::COOKIE_PRIORITY_HIGH;
+      return COOKIE_PRIORITY_HIGH;
   }
 
   NOTREACHED();
-  return net::COOKIE_PRIORITY_DEFAULT;
+  return COOKIE_PRIORITY_DEFAULT;
 }
 
 // Increments a specified TimeDelta by the duration between this object's
 // constructor and destructor. Not thread safe. Multiple instances may be
 // created with the same delta instance as long as their lifetimes are nested.
 // The shortest lived instances have no impact.
 class IncrementTimeDelta {
  public:
   explicit IncrementTimeDelta(base::TimeDelta* delta) :
       delta_(delta),
@@ skipping 26 matching lines @@
       "path TEXT NOT NULL,"
       "expires_utc INTEGER NOT NULL,"
       "secure INTEGER NOT NULL,"
       "httponly INTEGER NOT NULL,"
       "last_access_utc INTEGER NOT NULL, "
       "has_expires INTEGER NOT NULL DEFAULT 1, "
       "persistent INTEGER NOT NULL DEFAULT 1,"
       "priority INTEGER NOT NULL DEFAULT %d,"
       "encrypted_value BLOB DEFAULT '',"
       "firstpartyonly INTEGER NOT NULL DEFAULT 0)",
-      CookiePriorityToDBCookiePriority(net::COOKIE_PRIORITY_DEFAULT)));
+      CookiePriorityToDBCookiePriority(COOKIE_PRIORITY_DEFAULT)));
   if (!db->Execute(stmt.c_str()))
     return false;
 
   if (!db->Execute("CREATE INDEX domain ON cookies(host_key)"))
     return false;
 
 #if defined(OS_IOS)
   // iOS 8.1 and older doesn't support partial indices. iOS 8.2 supports
   // partial indices.
   if (!db->Execute("CREATE INDEX is_transient ON cookies(persistent)")) {
@@ skipping 145 matching lines @@
 
   if (load_success)
     ReportMetrics();
 }
 
 void SQLitePersistentCookieStore::Backend::Notify(
     const LoadedCallback& loaded_callback,
     bool load_success) {
   DCHECK(client_task_runner_->RunsTasksOnCurrentThread());
 
-  std::vector<net::CanonicalCookie*> cookies;
+  std::vector<CanonicalCookie*> cookies;
   {
     base::AutoLock locked(lock_);
     cookies.swap(cookies_);
   }
 
   loaded_callback.Run(cookies);
 }
 
 bool SQLitePersistentCookieStore::Backend::InitializeDatabase() {
   DCHECK(background_task_runner_->RunsTasksOnCurrentThread());
@@ skipping 70 matching lines @@
       base::Time::Now() - start,
       base::TimeDelta::FromMilliseconds(1), base::TimeDelta::FromMinutes(1),
       50);
 
   base::Time start_parse = base::Time::Now();
 
   // Build a map of domain keys (always eTLD+1) to domains.
   for (size_t idx = 0; idx < host_keys.size(); ++idx) {
     const std::string& domain = host_keys[idx];
     std::string key =
-        net::registry_controlled_domains::GetDomainAndRegistry(
+        registry_controlled_domains::GetDomainAndRegistry(
             domain,
-            net::registry_controlled_domains::INCLUDE_PRIVATE_REGISTRIES);
+            registry_controlled_domains::INCLUDE_PRIVATE_REGISTRIES);
 
     keys_to_load_[key].insert(domain);
   }
 
   UMA_HISTOGRAM_CUSTOM_TIMES(
       "Cookie.TimeParseDomains",
       base::Time::Now() - start_parse,
       base::TimeDelta::FromMilliseconds(1), base::TimeDelta::FromMinutes(1),
       50);
 
@@ skipping 64 matching lines @@
         "has_expires, persistent, priority FROM cookies WHERE host_key = ? "
         "AND persistent = 1"));
   }
   if (!smt.is_valid()) {
     smt.Clear();  // Disconnect smt_ref from db_.
     meta_table_.Reset();
     db_.reset();
     return false;
   }
 
-  std::vector<net::CanonicalCookie*> cookies;
+  std::vector<CanonicalCookie*> cookies;
   std::set<std::string>::const_iterator it = domains.begin();
   for (; it != domains.end(); ++it) {
     smt.BindString(0, *it);
     MakeCookiesFromSQLStatement(&cookies, &smt);
     smt.Reset(true);
   }
   {
     base::AutoLock locked(lock_);
     cookies_.insert(cookies_.end(), cookies.begin(), cookies.end());
   }
   return true;
 }
 
 void SQLitePersistentCookieStore::Backend::MakeCookiesFromSQLStatement(
-    std::vector<net::CanonicalCookie*>* cookies,
+    std::vector<CanonicalCookie*>* cookies,
     sql::Statement* statement) {
   sql::Statement& smt = *statement;
   while (smt.Step()) {
     std::string value;
     std::string encrypted_value = smt.ColumnString(4);
     if (!encrypted_value.empty() && crypto_) {
       crypto_->DecryptString(encrypted_value, &value);
     } else {
       DCHECK(encrypted_value.empty());
       value = smt.ColumnString(3);
     }
-    scoped_ptr<net::CanonicalCookie> cc(new net::CanonicalCookie(
+    scoped_ptr<CanonicalCookie> cc(new CanonicalCookie(
         // The "source" URL is not used with persisted cookies.
         GURL(),                                        // Source
         smt.ColumnString(2),                           // name
         value,                                         // value
         smt.ColumnString(1),                           // domain
         smt.ColumnString(5),                           // path
         Time::FromInternalValue(smt.ColumnInt64(0)),   // creation_utc
         Time::FromInternalValue(smt.ColumnInt64(6)),   // expires_utc
         Time::FromInternalValue(smt.ColumnInt64(10)),  // last_access_utc
         smt.ColumnInt(7) != 0,                         // secure
         smt.ColumnInt(8) != 0,                         // httponly
         smt.ColumnInt(9) != 0,                         // firstpartyonly
         DBCookiePriorityToCookiePriority(
             static_cast<DBCookiePriority>(smt.ColumnInt(13)))));  // priority
     DLOG_IF(WARNING, cc->CreationDate() > Time::Now())
         << L"CreationDate too recent";
-    cookies_per_origin_[CookieOrigin(cc->Domain(), cc->IsSecure())]++;
     cookies->push_back(cc.release());
     ++num_cookies_read_;
   }
 }
 
 bool SQLitePersistentCookieStore::Backend::EnsureDatabaseVersion() {
   // Version check.
   if (!meta_table_.Init(
       db_.get(), kCurrentVersionNumber, kCompatibleVersionNumber)) {
     return false;
@@ skipping 78 matching lines @@
   }
 
   if (cur_version == 5) {
     const base::TimeTicks start_time = base::TimeTicks::Now();
     sql::Transaction transaction(db_.get());
     if (!transaction.Begin())
       return false;
     // Alter the table to add the priority column with a default value.
     std::string stmt(base::StringPrintf(
         "ALTER TABLE cookies ADD COLUMN priority INTEGER DEFAULT %d",
-        CookiePriorityToDBCookiePriority(net::COOKIE_PRIORITY_DEFAULT)));
+        CookiePriorityToDBCookiePriority(COOKIE_PRIORITY_DEFAULT)));
     if (!db_->Execute(stmt.c_str())) {
       LOG(WARNING) << "Unable to update cookie database to version 6.";
       return false;
     }
     ++cur_version;
     meta_table_.SetVersionNumber(cur_version);
     meta_table_.SetCompatibleVersionNumber(
         std::min(cur_version, kCompatibleVersionNumber));
     transaction.Commit();
     UMA_HISTOGRAM_TIMES("Cookie.TimeDatabaseMigrationToV6",
@@ skipping 98 matching lines @@
       meta_table_.Reset();
       db_.reset();
       return false;
     }
   }
 
   return true;
 }
 
 void SQLitePersistentCookieStore::Backend::AddCookie(
-    const net::CanonicalCookie& cc) {
+    const CanonicalCookie& cc) {
   BatchOperation(PendingOperation::COOKIE_ADD, cc);
 }
 
 void SQLitePersistentCookieStore::Backend::UpdateCookieAccessTime(
-    const net::CanonicalCookie& cc) {
+    const CanonicalCookie& cc) {
   BatchOperation(PendingOperation::COOKIE_UPDATEACCESS, cc);
 }
 
 void SQLitePersistentCookieStore::Backend::DeleteCookie(
-    const net::CanonicalCookie& cc) {
+    const CanonicalCookie& cc) {
   BatchOperation(PendingOperation::COOKIE_DELETE, cc);
 }
 
 void SQLitePersistentCookieStore::Backend::BatchOperation(
     PendingOperation::OperationType op,
-    const net::CanonicalCookie& cc) {
+    const CanonicalCookie& cc) {
   // Commit every 30 seconds.
   static const int kCommitIntervalMs = 30 * 1000;
   // Commit right away if we have more than 512 outstanding operations.
   static const size_t kCommitAfterBatchSize = 512;
   DCHECK(!background_task_runner_->RunsTasksOnCurrentThread());
 
   // We do a full copy of the cookie here, and hopefully just here.
   scoped_ptr<PendingOperation> po(new PendingOperation(op, cc));
 
   PendingOperationsList::size_type num_pending;
@@ skipping 52 matching lines @@
   sql::Transaction transaction(db_.get());
   if (!transaction.Begin())
     return;
 
   for (PendingOperationsList::iterator it = ops.begin();
        it != ops.end(); ++it) {
     // Free the cookies as we commit them to the database.
     scoped_ptr<PendingOperation> po(*it);
     switch (po->op()) {
       case PendingOperation::COOKIE_ADD:
-        cookies_per_origin_[
-            CookieOrigin(po->cc().Domain(), po->cc().IsSecure())]++;
         add_smt.Reset(true);
         add_smt.BindInt64(0, po->cc().CreationDate().ToInternalValue());
         add_smt.BindString(1, po->cc().Domain());
         add_smt.BindString(2, po->cc().Name());
         if (crypto_) {
           std::string encrypted_value;
           add_smt.BindCString(3, "");  // value
           crypto_->EncryptString(po->cc().Value(), &encrypted_value);
           // BindBlob() immediately makes an internal copy of the data.
           add_smt.BindBlob(4, encrypted_value.data(),
@@ skipping 20 matching lines @@
         update_access_smt.Reset(true);
         update_access_smt.BindInt64(0,
             po->cc().LastAccessDate().ToInternalValue());
         update_access_smt.BindInt64(1,
             po->cc().CreationDate().ToInternalValue());
         if (!update_access_smt.Run())
           NOTREACHED() << "Could not update cookie last access time in the DB.";
         break;
 
       case PendingOperation::COOKIE_DELETE:
-        cookies_per_origin_[
-            CookieOrigin(po->cc().Domain(), po->cc().IsSecure())]--;
         del_smt.Reset(true);
         del_smt.BindInt64(0, po->cc().CreationDate().ToInternalValue());
         if (!del_smt.Run())
           NOTREACHED() << "Could not delete a cookie from the DB.";
         break;
 
       default:
         NOTREACHED();
         break;
     }
@@ skipping 27 matching lines @@
     PostBackgroundTask(FROM_HERE,
                        base::Bind(&Backend::InternalBackgroundClose, this));
   }
 }
 
 void SQLitePersistentCookieStore::Backend::InternalBackgroundClose() {
   DCHECK(background_task_runner_->RunsTasksOnCurrentThread());
   // Commit any pending operations
   Commit();
 
-  if (!force_keep_session_state_ && special_storage_policy_.get() &&
-      special_storage_policy_->HasSessionOnlyOrigins()) {
-    DeleteSessionCookiesOnShutdown();
-  }
-
   meta_table_.Reset();
   db_.reset();
 }
 
-void SQLitePersistentCookieStore::Backend::DeleteSessionCookiesOnShutdown() {
-  DCHECK(background_task_runner_->RunsTasksOnCurrentThread());
-
-  if (!db_)
-    return;
-
-  if (!special_storage_policy_.get())
-    return;
-
-  sql::Statement del_smt(db_->GetCachedStatement(
-      SQL_FROM_HERE, "DELETE FROM cookies WHERE host_key=? AND secure=?"));
-  if (!del_smt.is_valid()) {
-    LOG(WARNING) << "Unable to delete cookies on shutdown.";
-    return;
-  }
-
-  sql::Transaction transaction(db_.get());
-  if (!transaction.Begin()) {
-    LOG(WARNING) << "Unable to delete cookies on shutdown.";
-    return;
-  }
-
-  for (CookiesPerOriginMap::iterator it = cookies_per_origin_.begin();
-       it != cookies_per_origin_.end(); ++it) {
-    if (it->second <= 0) {
-      DCHECK_EQ(0, it->second);
-      continue;
-    }
-    const GURL url(net::cookie_util::CookieOriginToURL(it->first.first,
-                                                       it->first.second));
-    if (!url.is_valid() || !special_storage_policy_->IsStorageSessionOnly(url))
-      continue;
-
-    del_smt.Reset(true);
-    del_smt.BindString(0, it->first.first);
-    del_smt.BindInt(1, it->first.second);
-    if (!del_smt.Run())
-      NOTREACHED() << "Could not delete a cookie from the DB.";
-  }
-
-  if (!transaction.Commit())
-    LOG(WARNING) << "Unable to delete cookies on shutdown.";
-}
-
 void SQLitePersistentCookieStore::Backend::DatabaseErrorCallback(
     int error,
     sql::Statement* stmt) {
   DCHECK(background_task_runner_->RunsTasksOnCurrentThread());
 
   if (!sql::IsErrorCatastrophic(error))
     return;
 
   // TODO(shess): Running KillDatabase() multiple times should be
   // safe.
@@ skipping 16 matching lines @@
   if (db_) {
     // This Backend will now be in-memory only. In a future run we will recreate
     // the database. Hopefully things go better then!
     bool success = db_->RazeAndClose();
     UMA_HISTOGRAM_BOOLEAN("Cookie.KillDatabaseResult", success);
     meta_table_.Reset();
     db_.reset();
   }
 }
 
-void SQLitePersistentCookieStore::Backend::SetForceKeepSessionState() {
-  base::AutoLock locked(lock_);
-  force_keep_session_state_ = true;
+void SQLitePersistentCookieStore::Backend::DeleteAllInList(
+    const std::list<CookieOrigin>& cookies) {
+  if (cookies.empty())
+    return;
+
+  // Perform deletion on background task runner.
+  background_task_runner_->PostTask(
+      FROM_HERE,
+      base::Bind(
+          &Backend::BackgroundDeleteAllInList, this, cookies));
 }
 
 void SQLitePersistentCookieStore::Backend::DeleteSessionCookiesOnStartup() {
   DCHECK(background_task_runner_->RunsTasksOnCurrentThread());
   if (!db_->Execute("DELETE FROM cookies WHERE persistent != 1"))
     LOG(WARNING) << "Unable to delete session cookies.";
 }
 
+void SQLitePersistentCookieStore::Backend::BackgroundDeleteAllInList(
+    const std::list<CookieOrigin>& cookies) {
+  DCHECK(background_task_runner_->RunsTasksOnCurrentThread());
+
+  if (!db_)
+    return;
+
+  // Force a commit of any pending writes before issuing deletes.
+  // TODO(rohitrao): Remove the need for this Commit() by instead pruning the
+  // list of pending operations.

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

Bug to track this follow-up work so I can incessantly nag you if you don't? :D

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

Drat, you've found my secret plan to never fix it.

+  Commit();
+
+  sql::Statement del_smt(db_->GetCachedStatement(
+      SQL_FROM_HERE, "DELETE FROM cookies WHERE host_key=? AND secure=?"));
+  if (!del_smt.is_valid()) {
+    LOG(WARNING) << "Unable to delete cookies on shutdown.";
+    return;
+  }
+
+  sql::Transaction transaction(db_.get());
+  if (!transaction.Begin()) {
+    LOG(WARNING) << "Unable to delete cookies on shutdown.";
+    return;
+  }
+
+  for (auto it = cookies.begin(); it != cookies.end(); ++it) {

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

for (const auto& cookie : cookies) {

}

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

Done.

+    const GURL url(cookie_util::CookieOriginToURL(it->first, it->second));
+    if (!url.is_valid())
+      continue;
+
+    del_smt.Reset(true);
+    del_smt.BindString(0, it->first);
+    del_smt.BindInt(1, it->second);
+    if (!del_smt.Run())
+      NOTREACHED() << "Could not delete a cookie from the DB.";
+  }
+
+  if (!transaction.Commit())
+    LOG(WARNING) << "Unable to delete cookies on shutdown.";
+}
+
 void SQLitePersistentCookieStore::Backend::PostBackgroundTask(
     const tracked_objects::Location& origin, const base::Closure& task) {
   if (!background_task_runner_->PostTask(origin, task)) {
     LOG(WARNING) << "Failed to post task from " << origin.ToString()
                  << " to background_task_runner_.";
   }
 }
 
 void SQLitePersistentCookieStore::Backend::PostClientTask(
     const tracked_objects::Location& origin, const base::Closure& task) {
   if (!client_task_runner_->PostTask(origin, task)) {
     LOG(WARNING) << "Failed to post task from " << origin.ToString()
                  << " to client_task_runner_.";
   }
 }
 
 void SQLitePersistentCookieStore::Backend::FinishedLoadingCookies(
     const LoadedCallback& loaded_callback,
     bool success) {
   PostClientTask(FROM_HERE, base::Bind(&Backend::CompleteLoadInForeground, this,
                                        loaded_callback, success));
 }
 
 SQLitePersistentCookieStore::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)
     : backend_(new Backend(path,
                            client_task_runner,
                            background_task_runner,
                            restore_old_session_cookies,
-                           special_storage_policy,
                            crypto_delegate)) {
 }
 
+void SQLitePersistentCookieStore::DeleteAllInList(
+    const std::list<CookieOrigin>& cookies) {
+  backend_->DeleteAllInList(cookies);
+}
+
 void SQLitePersistentCookieStore::Load(const LoadedCallback& loaded_callback) {
   backend_->Load(loaded_callback);
 }
 
 void SQLitePersistentCookieStore::LoadCookiesForKey(
     const std::string& key,
     const LoadedCallback& loaded_callback) {
   backend_->LoadCookiesForKey(key, loaded_callback);
 }
 
-void SQLitePersistentCookieStore::AddCookie(const net::CanonicalCookie& cc) {
+void SQLitePersistentCookieStore::AddCookie(const CanonicalCookie& cc) {
   backend_->AddCookie(cc);
 }
 
 void SQLitePersistentCookieStore::UpdateCookieAccessTime(
-    const net::CanonicalCookie& cc) {
+    const CanonicalCookie& cc) {
   backend_->UpdateCookieAccessTime(cc);
 }
 
-void SQLitePersistentCookieStore::DeleteCookie(const net::CanonicalCookie& cc) {
+void SQLitePersistentCookieStore::DeleteCookie(const CanonicalCookie& cc) {
   backend_->DeleteCookie(cc);
 }
 
 void SQLitePersistentCookieStore::SetForceKeepSessionState() {
-  backend_->SetForceKeepSessionState();
+  // This store never discards session-only cookies, so this call has no effect.
 }
 
 void SQLitePersistentCookieStore::Flush(const base::Closure& callback) {
   backend_->Flush(callback);
 }
 
 SQLitePersistentCookieStore::~SQLitePersistentCookieStore() {
   backend_->Close();
   // We release our reference to the Backend, though it will probably still have
   // a reference if the background runner has not run Close() yet.
 }
 
-CookieStoreConfig::CookieStoreConfig()
-  : session_cookie_mode(EPHEMERAL_SESSION_COOKIES),
-    crypto_delegate(NULL) {
-  // Default to an in-memory cookie store.
-}
-
-CookieStoreConfig::CookieStoreConfig(
-    const base::FilePath& path,
-    SessionCookieMode session_cookie_mode,
-    storage::SpecialStoragePolicy* storage_policy,
-    net::CookieMonsterDelegate* cookie_delegate)
-    : path(path),
-      session_cookie_mode(session_cookie_mode),
-      storage_policy(storage_policy),
-      cookie_delegate(cookie_delegate),
-      crypto_delegate(NULL) {
-  CHECK(!path.empty() || session_cookie_mode == EPHEMERAL_SESSION_COOKIES);
-}
-
-CookieStoreConfig::~CookieStoreConfig() {
-}
-
-net::CookieStore* CreateCookieStore(const CookieStoreConfig& config) {
-  // TODO(bcwhite): Remove ScopedTracker below once crbug.com/483686 is fixed.
-  tracked_objects::ScopedTracker tracking_profile(
-      FROM_HERE_WITH_EXPLICIT_FUNCTION("483686 content::CreateCookieStore"));
-
-  net::CookieMonster* cookie_monster = NULL;
-
-  if (config.path.empty()) {
-    // Empty path means in-memory store.
-    cookie_monster = new net::CookieMonster(NULL, config.cookie_delegate.get());
-  } else {
-    scoped_refptr<base::SequencedTaskRunner> client_task_runner =
-        config.client_task_runner;
-    scoped_refptr<base::SequencedTaskRunner> background_task_runner =
-        config.background_task_runner;
-
-    if (!client_task_runner.get()) {
-      client_task_runner =
-          BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO);
-    }
-
-    if (!background_task_runner.get()) {
-      background_task_runner =
-          BrowserThread::GetBlockingPool()->GetSequencedTaskRunner(
-              BrowserThread::GetBlockingPool()->GetSequenceToken());
-    }
-
-    SQLitePersistentCookieStore* persistent_store =
-        new SQLitePersistentCookieStore(
-            config.path,
-            client_task_runner,
-            background_task_runner,
-            (config.session_cookie_mode ==
-             CookieStoreConfig::RESTORED_SESSION_COOKIES),
-            config.storage_policy.get(),
-            config.crypto_delegate);
-
-    cookie_monster =
-        new net::CookieMonster(persistent_store, config.cookie_delegate.get());
-    if ((config.session_cookie_mode ==
-         CookieStoreConfig::PERSISTANT_SESSION_COOKIES) ||
-        (config.session_cookie_mode ==
-         CookieStoreConfig::RESTORED_SESSION_COOKIES)) {
-      cookie_monster->SetPersistSessionCookies(true);
-    }
-  }
-
-  return cookie_monster;
-}
-
-}  // namespace content
+}  // namespace net