Revert of Encrypt all stored cookies on selected operating systems.

content/browser/net/sqlite_persistent_cookie_store_perftest.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 "base/bind.h"
 #include "base/compiler_specific.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/sequenced_task_runner.h"
 #include "base/strings/stringprintf.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/test/perf_time_logger.h"
 #include "base/test/sequenced_worker_pool_owner.h"
 #include "base/threading/sequenced_worker_pool.h"
-#include "content/public/browser/cookie_crypto_delegate.h"
 #include "net/cookies/canonical_cookie.h"
 #include "net/cookies/cookie_constants.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "url/gurl.h"
 
 namespace content {
 
 namespace {
 
 const base::FilePath::CharType cookie_filename[] = FILE_PATH_LITERAL("Cookies");
@@ skipping 33 matching lines @@
     return pool_owner_->pool()->GetSequencedTaskRunner(
         pool_owner_->pool()->GetNamedSequenceToken("client"));
   }
 
   virtual void SetUp() OVERRIDE {
     ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
     store_ = new SQLitePersistentCookieStore(
         temp_dir_.path().Append(cookie_filename),
         client_task_runner(),
         background_task_runner(),
-        false, NULL,
-        scoped_ptr<content::CookieCryptoDelegate>());
+        false, NULL);
     std::vector<net::CanonicalCookie*> cookies;
     Load();
     ASSERT_EQ(0u, cookies_.size());
     // Creates 15000 cookies from 300 eTLD+1s.
     base::Time t = base::Time::Now();
     for (int domain_num = 0; domain_num < 300; domain_num++) {
       std::string domain_name(base::StringPrintf(".domain_%d.com", domain_num));
       GURL gurl("www" + domain_name);
       for (int cookie_num = 0; cookie_num < 50; ++cookie_num) {
         t += base::TimeDelta::FromInternalValue(10);
@@ skipping 10 matching lines @@
 
     // Shut down the pool, causing deferred (no-op) commits to be discarded.
     pool_owner_->pool()->Shutdown();
     // ~SequencedWorkerPoolOwner blocks on pool shutdown.
     pool_owner_.reset(new base::SequencedWorkerPoolOwner(1, "pool"));
 
     store_ = new SQLitePersistentCookieStore(
         temp_dir_.path().Append(cookie_filename),
         client_task_runner(),
         background_task_runner(),
-        false, NULL,
-        scoped_ptr<content::CookieCryptoDelegate>());
+        false, NULL);
   }
 
   virtual void TearDown() OVERRIDE {
     store_ = NULL;
     pool_owner_->pool()->Shutdown();
   }
 
  protected:
   scoped_ptr<base::SequencedWorkerPoolOwner> pool_owner_;
   base::WaitableEvent loaded_event_;
@@ skipping 22 matching lines @@
 // Test the performance of load
 TEST_F(SQLitePersistentCookieStorePerfTest, TestLoadPerformance) {
   base::PerfTimeLogger timer("Load all cookies");
   Load();
   timer.Done();
 
   ASSERT_EQ(15000U, cookies_.size());
 }
 
 }  // namespace content