| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "base/bind.h" | 5 #include "base/bind.h" |
| 6 #include "base/files/file_util.h" | 6 #include "base/files/file_util.h" |
| 7 #include "base/files/scoped_temp_dir.h" | 7 #include "base/files/scoped_temp_dir.h" |
| 8 #include "base/memory/ref_counted.h" | 8 #include "base/memory/ref_counted.h" |
| 9 #include "base/run_loop.h" | 9 #include "base/run_loop.h" |
| 10 #include "base/stl_util.h" | 10 #include "base/stl_util.h" |
| (...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 89 store_ = new QuotaPolicyCookieStore(sqlite_store.get(), storage_policy); | 89 store_ = new QuotaPolicyCookieStore(sqlite_store.get(), storage_policy); |
| 90 Load(cookies); | 90 Load(cookies); |
| 91 } | 91 } |
| 92 | 92 |
| 93 // Adds a persistent cookie to store_. | 93 // Adds a persistent cookie to store_. |
| 94 void AddCookie(const std::string& name, | 94 void AddCookie(const std::string& name, |
| 95 const std::string& value, | 95 const std::string& value, |
| 96 const std::string& domain, | 96 const std::string& domain, |
| 97 const std::string& path, | 97 const std::string& path, |
| 98 const base::Time& creation) { | 98 const base::Time& creation) { |
| 99 store_->AddCookie( | 99 store_->AddCookie(net::CanonicalCookie( |
| 100 net::CanonicalCookie( | 100 GURL(), name, value, domain, path, creation, creation, creation, false, |
| 101 GURL(), name, value, domain, path, creation, creation, creation, | 101 false, net::COOKIE_SAME_SITE_DEFAULT, net::COOKIE_PRIORITY_DEFAULT)); |
| 102 false, false, false, net::COOKIE_PRIORITY_DEFAULT)); | |
| 103 } | 102 } |
| 104 | 103 |
| 105 void DestroyStore() { | 104 void DestroyStore() { |
| 106 store_ = nullptr; | 105 store_ = nullptr; |
| 107 // Ensure that |store_|'s destructor has run by shutting down the pool and | 106 // Ensure that |store_|'s destructor has run by shutting down the pool and |
| 108 // then forcing the pool to be destructed. This will ensure that all the | 107 // then forcing the pool to be destructed. This will ensure that all the |
| 109 // tasks that block pool shutdown (e.g. |store_|'s cleanup) have run before | 108 // tasks that block pool shutdown (e.g. |store_|'s cleanup) have run before |
| 110 // yielding control. | 109 // yielding control. |
| 111 pool_owner_->pool()->FlushForTesting(); | 110 pool_owner_->pool()->FlushForTesting(); |
| 112 pool_owner_.reset(new base::SequencedWorkerPoolOwner(3, "Background Pool")); | 111 pool_owner_.reset(new base::SequencedWorkerPoolOwner(3, "Background Pool")); |
| (...skipping 167 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 280 // Reload and test for persistence. | 279 // Reload and test for persistence. |
| 281 STLDeleteElements(&cookies); | 280 STLDeleteElements(&cookies); |
| 282 CreateAndLoad(storage_policy.get(), &cookies); | 281 CreateAndLoad(storage_policy.get(), &cookies); |
| 283 EXPECT_EQ(0U, cookies.size()); | 282 EXPECT_EQ(0U, cookies.size()); |
| 284 | 283 |
| 285 STLDeleteElements(&cookies); | 284 STLDeleteElements(&cookies); |
| 286 } | 285 } |
| 287 | 286 |
| 288 } // namespace | 287 } // namespace |
| 289 } // namespace content | 288 } // namespace content |
| OLD | NEW |