| Index: net/extras/sqlite/sqlite_persistent_cookie_store_unittest.cc
|
| diff --git a/content/browser/net/sqlite_persistent_cookie_store_unittest.cc b/net/extras/sqlite/sqlite_persistent_cookie_store_unittest.cc
|
| similarity index 98%
|
| rename from content/browser/net/sqlite_persistent_cookie_store_unittest.cc
|
| rename to net/extras/sqlite/sqlite_persistent_cookie_store_unittest.cc
|
| index 41d20a8c3a9c9b1491e6bcccb3d2bc0bf9a30c21..e21298f966888127472925f55001dcc5ad297978 100644
|
| --- a/content/browser/net/sqlite_persistent_cookie_store_unittest.cc
|
| +++ b/net/extras/sqlite/sqlite_persistent_cookie_store_unittest.cc
|
| @@ -2,7 +2,7 @@
|
| // 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 <map>
|
| #include <set>
|
| @@ -11,15 +11,14 @@
|
| #include "base/callback.h"
|
| #include "base/files/file_util.h"
|
| #include "base/files/scoped_temp_dir.h"
|
| +#include "base/location.h"
|
| #include "base/memory/ref_counted.h"
|
| -#include "base/message_loop/message_loop.h"
|
| #include "base/sequenced_task_runner.h"
|
| #include "base/stl_util.h"
|
| #include "base/synchronization/waitable_event.h"
|
| #include "base/test/sequenced_worker_pool_owner.h"
|
| #include "base/threading/sequenced_worker_pool.h"
|
| #include "base/time/time.h"
|
| -#include "content/public/browser/cookie_store_factory.h"
|
| #include "crypto/encryptor.h"
|
| #include "crypto/symmetric_key.h"
|
| #include "net/cookies/canonical_cookie.h"
|
| @@ -31,7 +30,7 @@
|
| #include "testing/gtest/include/gtest/gtest.h"
|
| #include "url/gurl.h"
|
|
|
| -namespace content {
|
| +namespace net {
|
|
|
| namespace {
|
|
|
| @@ -136,7 +135,6 @@ class SQLitePersistentCookieStoreTest : public testing::Test {
|
| client_task_runner(),
|
| background_task_runner(),
|
| restore_old_session_cookies,
|
| - NULL,
|
| cookie_crypto_delegate_.get());
|
| Load(cookies);
|
| }
|
| @@ -180,7 +178,6 @@ class SQLitePersistentCookieStoreTest : public testing::Test {
|
| }
|
|
|
| protected:
|
| - base::MessageLoop main_loop_;
|
| scoped_ptr<base::SequencedWorkerPoolOwner> pool_owner_;
|
| base::WaitableEvent loaded_event_;
|
| base::WaitableEvent key_loaded_event_;
|
| @@ -275,7 +272,7 @@ TEST_F(SQLitePersistentCookieStoreTest, TestLoadCookiesForKey) {
|
| temp_dir_.path().Append(kCookieFilename),
|
| client_task_runner(),
|
| background_task_runner(),
|
| - false, NULL, NULL);
|
| + false, NULL);
|
|
|
| // Posting a blocking task to db_thread_ makes sure that the DB thread waits
|
| // until both Load and LoadCookiesForKey have been posted to its task queue.
|
| @@ -591,4 +588,4 @@ TEST_F(SQLitePersistentCookieStoreTest, UpdateToEncryption) {
|
| EXPECT_EQ(contents.find("something456ABC"), std::string::npos);
|
| }
|
|
|
| -} // namespace content
|
| +} // namespace net
|
|
|