Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(136)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/browsing_data/cookies_tree_model_unittest.cc

Issue 1297093002: Cache Storage API: Hook up to chrome://settings/cookies (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase onto https://codereview.chromium.org/1297023004 Created 5 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/browsing_data/cookies_tree_model.cc ('k') | chrome/browser/browsing_data/local_data_container.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/browsing_data/cookies_tree_model_unittest.cc
diff --git a/chrome/browser/browsing_data/cookies_tree_model_unittest.cc b/chrome/browser/browsing_data/cookies_tree_model_unittest.cc
index 9457982c7219c9f0b50d5586e01acbea7a387eb8..7723a4f4018cb0d99d1932e2041c47c27dfa8e06 100644
--- a/chrome/browser/browsing_data/cookies_tree_model_unittest.cc
+++ b/chrome/browser/browsing_data/cookies_tree_model_unittest.cc
@@ -10,6 +10,7 @@
#include "base/prefs/pref_service.h"
#include "base/strings/utf_string_conversions.h"
#include "chrome/browser/browsing_data/mock_browsing_data_appcache_helper.h"
+#include "chrome/browser/browsing_data/mock_browsing_data_cache_storage_helper.h"
#include "chrome/browser/browsing_data/mock_browsing_data_channel_id_helper.h"
#include "chrome/browser/browsing_data/mock_browsing_data_cookie_helper.h"
#include "chrome/browser/browsing_data/mock_browsing_data_database_helper.h"
@@ -74,6 +75,8 @@ class CookiesTreeModelTest : public testing::Test {
new MockBrowsingDataChannelIDHelper();
mock_browsing_data_service_worker_helper_ =
new MockBrowsingDataServiceWorkerHelper(profile_.get());
+ mock_browsing_data_cache_storage_helper_ =
+ new MockBrowsingDataCacheStorageHelper(profile_.get());
mock_browsing_data_flash_lso_helper_ =
new MockBrowsingDataFlashLSOHelper(profile_.get());
@@ -90,6 +93,7 @@ class CookiesTreeModelTest : public testing::Test {
void TearDown() override {
mock_browsing_data_service_worker_helper_ = nullptr;
+ mock_browsing_data_cache_storage_helper_ = nullptr;
mock_browsing_data_channel_id_helper_ = nullptr;
mock_browsing_data_quota_helper_ = nullptr;
mock_browsing_data_file_system_helper_ = nullptr;
@@ -103,18 +107,19 @@ class CookiesTreeModelTest : public testing::Test {
}
scoped_ptr<CookiesTreeModel> CreateCookiesTreeModelWithInitialSample() {
- LocalDataContainer* container = new LocalDataContainer(
- mock_browsing_data_cookie_helper_.get(),
- mock_browsing_data_database_helper_.get(),
- mock_browsing_data_local_storage_helper_.get(),
- mock_browsing_data_session_storage_helper_.get(),
- mock_browsing_data_appcache_helper_.get(),
- mock_browsing_data_indexed_db_helper_.get(),
- mock_browsing_data_file_system_helper_.get(),
- mock_browsing_data_quota_helper_.get(),
- mock_browsing_data_channel_id_helper_.get(),
- mock_browsing_data_service_worker_helper_.get(),
- mock_browsing_data_flash_lso_helper_.get());
+ LocalDataContainer* container =
+ new LocalDataContainer(mock_browsing_data_cookie_helper_.get(),
+ mock_browsing_data_database_helper_.get(),
+ mock_browsing_data_local_storage_helper_.get(),
+ mock_browsing_data_session_storage_helper_.get(),
+ mock_browsing_data_appcache_helper_.get(),
+ mock_browsing_data_indexed_db_helper_.get(),
+ mock_browsing_data_file_system_helper_.get(),
+ mock_browsing_data_quota_helper_.get(),
+ mock_browsing_data_channel_id_helper_.get(),
+ mock_browsing_data_service_worker_helper_.get(),
+ mock_browsing_data_cache_storage_helper_.get(),
+ mock_browsing_data_flash_lso_helper_.get());
CookiesTreeModel* cookies_model =
new CookiesTreeModel(container, special_storage_policy(), false);
@@ -144,15 +149,20 @@ class CookiesTreeModelTest : public testing::Test {
mock_browsing_data_channel_id_helper_->Notify();
mock_browsing_data_service_worker_helper_->AddServiceWorkerSamples();
mock_browsing_data_service_worker_helper_->Notify();
+ mock_browsing_data_cache_storage_helper_->AddCacheStorageSamples();
+ mock_browsing_data_cache_storage_helper_->Notify();
mock_browsing_data_flash_lso_helper_->AddFlashLSODomain("xyz.com");
mock_browsing_data_flash_lso_helper_->Notify();
{
- SCOPED_TRACE("Initial State 3 cookies, 2 databases, 2 local storages, "
- "2 session storages, 2 indexed DBs, 3 filesystems, "
- "2 quotas, 2 server bound certs, 2 service workers, "
- "1 Flash LSO");
- // 59 because there's the root, then
+ SCOPED_TRACE(
+ "Initial State 3 cookies, 2 databases, 2 local storages, "
+ "2 session storages, 2 indexed DBs, 3 filesystems, "
+ "2 quotas, 2 server bound certs, 2 service workers, "
+ "2 cache storages, 1 Flash LSO");
+ // 65 because there's the root, then
+ // cshost1 -> cache storage -> https://cshost1:1/
+ // cshost2 -> cache storage -> https://cshost2:2/
// foo1 -> cookies -> a,
// foo2 -> cookies -> b,
// foo3 -> cookies -> c,
@@ -174,7 +184,7 @@ class CookiesTreeModelTest : public testing::Test {
// swhost1 -> service worker -> https://swhost1:1
// swhost2 -> service worker -> https://swhost1:2
// xyz.com -> flash_lsos
- EXPECT_EQ(59, cookies_model->GetRoot()->GetTotalNodeCount());
+ EXPECT_EQ(65, cookies_model->GetRoot()->GetTotalNodeCount());
EXPECT_EQ("A,B,C", GetDisplayedCookies(cookies_model));
EXPECT_EQ("db1,db2", GetDisplayedDatabases(cookies_model));
EXPECT_EQ("http://host1:1/,http://host2:2/",
@@ -191,6 +201,8 @@ class CookiesTreeModelTest : public testing::Test {
GetDisplayedChannelIDs(cookies_model));
EXPECT_EQ("https://swhost1:1/,https://swhost2:2/",
GetDisplayedServiceWorkers(cookies_model));
+ EXPECT_EQ("https://cshost1:1/,https://cshost2:2/",
+ GetDisplayedCacheStorages(cookies_model));
EXPECT_EQ("xyz.com",
GetDisplayedFlashLSOs(cookies_model));
}
@@ -274,6 +286,8 @@ class CookiesTreeModelTest : public testing::Test {
return node->GetDetailedInfo().channel_id->server_identifier() + ",";
case CookieTreeNode::DetailedInfo::TYPE_SERVICE_WORKER:
return node->GetDetailedInfo().service_worker_info->origin.spec() + ",";
+ case CookieTreeNode::DetailedInfo::TYPE_CACHE_STORAGE:
+ return node->GetDetailedInfo().cache_storage_info->origin.spec() + ",";
case CookieTreeNode::DetailedInfo::TYPE_FLASH_LSO:
return node->GetDetailedInfo().flash_lso_domain + ",";
default:
@@ -320,6 +334,11 @@ class CookiesTreeModelTest : public testing::Test {
node, CookieTreeNode::DetailedInfo::TYPE_SERVICE_WORKER);
}
+ std::string GetCacheStoragesOfChildren(const CookieTreeNode* node) {
+ return GetNodesOfChildren(node,
+ CookieTreeNode::DetailedInfo::TYPE_CACHE_STORAGE);
+ }
+
std::string GetFlashLSOsOfChildren(const CookieTreeNode* node) {
return GetNodesOfChildren(
node, CookieTreeNode::DetailedInfo::TYPE_FLASH_LSO);
@@ -388,6 +407,11 @@ class CookiesTreeModelTest : public testing::Test {
CookieTreeNode::DetailedInfo::TYPE_SERVICE_WORKER);
}
+ std::string GetDisplayedCacheStorages(CookiesTreeModel* cookies_model) {
+ return GetDisplayedNodes(cookies_model,
+ CookieTreeNode::DetailedInfo::TYPE_CACHE_STORAGE);
+ }
+
std::string GetDisplayedFlashLSOs(CookiesTreeModel* cookies_model) {
return GetDisplayedNodes(
cookies_model, CookieTreeNode::DetailedInfo::TYPE_FLASH_LSO);
@@ -432,6 +456,8 @@ class CookiesTreeModelTest : public testing::Test {
mock_browsing_data_channel_id_helper_;
scoped_refptr<MockBrowsingDataServiceWorkerHelper>
mock_browsing_data_service_worker_helper_;
+ scoped_refptr<MockBrowsingDataCacheStorageHelper>
+ mock_browsing_data_cache_storage_helper_;
scoped_refptr<MockBrowsingDataFlashLSOHelper>
mock_browsing_data_flash_lso_helper_;
@@ -463,6 +489,8 @@ TEST_F(CookiesTreeModelTest, RemoveAll) {
GetDisplayedQuotas(cookies_model.get()));
EXPECT_EQ("sbc1,sbc2",
GetDisplayedChannelIDs(cookies_model.get()));
+ EXPECT_EQ("https://cshost1:1/,https://cshost2:2/",
+ GetDisplayedCacheStorages(cookies_model.get()));
EXPECT_EQ("https://swhost1:1/,https://swhost2:2/",
GetDisplayedServiceWorkers(cookies_model.get()));
EXPECT_EQ("xyz.com",
@@ -475,6 +503,7 @@ TEST_F(CookiesTreeModelTest, RemoveAll) {
mock_browsing_data_session_storage_helper_->Reset();
mock_browsing_data_indexed_db_helper_->Reset();
mock_browsing_data_service_worker_helper_->Reset();
+ mock_browsing_data_cache_storage_helper_->Reset();
mock_browsing_data_file_system_helper_->Reset();
cookies_model->DeleteAllStoredObjects();
@@ -497,6 +526,7 @@ TEST_F(CookiesTreeModelTest, RemoveAll) {
EXPECT_TRUE(mock_browsing_data_file_system_helper_->AllDeleted());
EXPECT_TRUE(mock_browsing_data_channel_id_helper_->AllDeleted());
EXPECT_TRUE(mock_browsing_data_service_worker_helper_->AllDeleted());
+ EXPECT_TRUE(mock_browsing_data_cache_storage_helper_->AllDeleted());
EXPECT_TRUE(mock_browsing_data_flash_lso_helper_->AllDeleted());
}
}
@@ -507,30 +537,32 @@ TEST_F(CookiesTreeModelTest, Remove) {
// Children start out arranged as follows:
//
- // 0. `foo1`
- // 1. `foo2`
- // 2. `foo3`
- // 3. `fshost1`
- // 4. `fshost2`
- // 5. `fshost3`
- // 6. `gdbhost1`
- // 7. `gdbhost2`
- // 8. `host1`
- // 9. `host2`
- // 10. `idbhost1`
- // 11. `idbhost2`
- // 12. `quotahost1`
- // 13. `quotahost2`
- // 14. `sbc1`
- // 15. `sbc2`
- // 16. 'swhost1'
- // 17. 'swhost2'
- // 18. `xyz.com`
+ // 0. `cshost1`
+ // 1. `cshost2`
+ // 2. `foo1`
+ // 3. `foo2`
+ // 4. `foo3`
+ // 5. `fshost1`
+ // 6. `fshost2`
+ // 7. `fshost3`
+ // 8. `gdbhost1`
+ // 9. `gdbhost2`
+ // 10. `host1`
+ // 11. `host2`
+ // 12. `idbhost1`
+ // 13. `idbhost2`
+ // 14. `quotahost1`
+ // 15. `quotahost2`
+ // 16. `sbc1`
+ // 17. `sbc2`
+ // 18. `swhost1`
+ // 19. `swhost2`
+ // 20. `xyz.com`
//
// Here, we'll remove them one by one, starting from the end, and
// check that the state makes sense.
- DeleteStoredObjects(cookies_model->GetRoot()->GetChild(18));
+ DeleteStoredObjects(cookies_model->GetRoot()->GetChild(20));
{
SCOPED_TRACE("`xyz.com` removed.");
EXPECT_STREQ("A,B,C", GetDisplayedCookies(cookies_model.get()).c_str());
@@ -549,9 +581,12 @@ TEST_F(CookiesTreeModelTest, Remove) {
GetDisplayedChannelIDs(cookies_model.get()));
EXPECT_EQ("https://swhost1:1/,https://swhost2:2/",
GetDisplayedServiceWorkers(cookies_model.get()));
- EXPECT_EQ(57, cookies_model->GetRoot()->GetTotalNodeCount());
+ EXPECT_EQ("https://cshost1:1/,https://cshost2:2/",
+ GetDisplayedCacheStorages(cookies_model.get()));
+ EXPECT_EQ("", GetDisplayedFlashLSOs(cookies_model.get()));
+ EXPECT_EQ(63, cookies_model->GetRoot()->GetTotalNodeCount());
}
- DeleteStoredObjects(cookies_model->GetRoot()->GetChild(17));
+ DeleteStoredObjects(cookies_model->GetRoot()->GetChild(19));
{
SCOPED_TRACE("`swhost2` removed.");
EXPECT_STREQ("A,B,C", GetDisplayedCookies(cookies_model.get()).c_str());
@@ -564,15 +599,16 @@ TEST_F(CookiesTreeModelTest, Remove) {
GetDisplayedFileSystems(cookies_model.get()));
EXPECT_EQ("http://idbhost1:1/,http://idbhost2:2/",
GetDisplayedIndexedDBs(cookies_model.get()));
- EXPECT_EQ("quotahost1,quotahost2",
- GetDisplayedQuotas(cookies_model.get()));
- EXPECT_EQ("sbc1,sbc2",
- GetDisplayedChannelIDs(cookies_model.get()));
+ EXPECT_EQ("quotahost1,quotahost2", GetDisplayedQuotas(cookies_model.get()));
+ EXPECT_EQ("sbc1,sbc2", GetDisplayedChannelIDs(cookies_model.get()));
EXPECT_EQ("https://swhost1:1/",
GetDisplayedServiceWorkers(cookies_model.get()));
- EXPECT_EQ(54, cookies_model->GetRoot()->GetTotalNodeCount());
+ EXPECT_EQ("https://cshost1:1/,https://cshost2:2/",
+ GetDisplayedCacheStorages(cookies_model.get()));
+ EXPECT_EQ("", GetDisplayedFlashLSOs(cookies_model.get()));
+ EXPECT_EQ(60, cookies_model->GetRoot()->GetTotalNodeCount());
}
- DeleteStoredObjects(cookies_model->GetRoot()->GetChild(16));
+ DeleteStoredObjects(cookies_model->GetRoot()->GetChild(18));
{
SCOPED_TRACE("`swhost1` removed.");
EXPECT_STREQ("A,B,C", GetDisplayedCookies(cookies_model.get()).c_str());
@@ -585,14 +621,15 @@ TEST_F(CookiesTreeModelTest, Remove) {
GetDisplayedFileSystems(cookies_model.get()));
EXPECT_EQ("http://idbhost1:1/,http://idbhost2:2/",
GetDisplayedIndexedDBs(cookies_model.get()));
- EXPECT_EQ("quotahost1,quotahost2",
- GetDisplayedQuotas(cookies_model.get()));
- EXPECT_EQ("sbc1,sbc2",
- GetDisplayedChannelIDs(cookies_model.get()));
+ EXPECT_EQ("quotahost1,quotahost2", GetDisplayedQuotas(cookies_model.get()));
+ EXPECT_EQ("sbc1,sbc2", GetDisplayedChannelIDs(cookies_model.get()));
EXPECT_EQ("", GetDisplayedServiceWorkers(cookies_model.get()));
- EXPECT_EQ(51, cookies_model->GetRoot()->GetTotalNodeCount());
+ EXPECT_EQ("https://cshost1:1/,https://cshost2:2/",
+ GetDisplayedCacheStorages(cookies_model.get()));
+ EXPECT_EQ("", GetDisplayedFlashLSOs(cookies_model.get()));
+ EXPECT_EQ(57, cookies_model->GetRoot()->GetTotalNodeCount());
}
- DeleteStoredObjects(cookies_model->GetRoot()->GetChild(15));
+ DeleteStoredObjects(cookies_model->GetRoot()->GetChild(17));
{
SCOPED_TRACE("`sbc2` removed.");
EXPECT_STREQ("A,B,C", GetDisplayedCookies(cookies_model.get()).c_str());
@@ -610,9 +647,12 @@ TEST_F(CookiesTreeModelTest, Remove) {
EXPECT_EQ("sbc1",
GetDisplayedChannelIDs(cookies_model.get()));
EXPECT_EQ("", GetDisplayedServiceWorkers(cookies_model.get()));
- EXPECT_EQ(48, cookies_model->GetRoot()->GetTotalNodeCount());
+ EXPECT_EQ("https://cshost1:1/,https://cshost2:2/",
+ GetDisplayedCacheStorages(cookies_model.get()));
+ EXPECT_EQ("", GetDisplayedFlashLSOs(cookies_model.get()));
+ EXPECT_EQ(54, cookies_model->GetRoot()->GetTotalNodeCount());
}
- DeleteStoredObjects(cookies_model->GetRoot()->GetChild(14));
+ DeleteStoredObjects(cookies_model->GetRoot()->GetChild(16));
{
SCOPED_TRACE("`sbc1` removed.");
EXPECT_STREQ("A,B,C", GetDisplayedCookies(cookies_model.get()).c_str());
@@ -627,10 +667,14 @@ TEST_F(CookiesTreeModelTest, Remove) {
GetDisplayedIndexedDBs(cookies_model.get()));
EXPECT_EQ("quotahost1,quotahost2",
GetDisplayedQuotas(cookies_model.get()));
+ EXPECT_EQ("", GetDisplayedChannelIDs(cookies_model.get()));
EXPECT_EQ("", GetDisplayedServiceWorkers(cookies_model.get()));
- EXPECT_EQ(45, cookies_model->GetRoot()->GetTotalNodeCount());
+ EXPECT_EQ("https://cshost1:1/,https://cshost2:2/",
+ GetDisplayedCacheStorages(cookies_model.get()));
+ EXPECT_EQ("", GetDisplayedFlashLSOs(cookies_model.get()));
+ EXPECT_EQ(51, cookies_model->GetRoot()->GetTotalNodeCount());
}
- DeleteStoredObjects(cookies_model->GetRoot()->GetChild(13));
+ DeleteStoredObjects(cookies_model->GetRoot()->GetChild(15));
{
SCOPED_TRACE("`quotahost2` removed.");
EXPECT_STREQ("A,B,C", GetDisplayedCookies(cookies_model.get()).c_str());
@@ -646,9 +690,12 @@ TEST_F(CookiesTreeModelTest, Remove) {
EXPECT_EQ("quotahost1",
GetDisplayedQuotas(cookies_model.get()));
EXPECT_EQ("", GetDisplayedServiceWorkers(cookies_model.get()));
- EXPECT_EQ(43, cookies_model->GetRoot()->GetTotalNodeCount());
+ EXPECT_EQ("https://cshost1:1/,https://cshost2:2/",
+ GetDisplayedCacheStorages(cookies_model.get()));
+ EXPECT_EQ("", GetDisplayedFlashLSOs(cookies_model.get()));
+ EXPECT_EQ(49, cookies_model->GetRoot()->GetTotalNodeCount());
}
- DeleteStoredObjects(cookies_model->GetRoot()->GetChild(12));
+ DeleteStoredObjects(cookies_model->GetRoot()->GetChild(14));
{
SCOPED_TRACE("`quotahost1` removed.");
EXPECT_STREQ("A,B,C", GetDisplayedCookies(cookies_model.get()).c_str());
@@ -662,9 +709,12 @@ TEST_F(CookiesTreeModelTest, Remove) {
EXPECT_EQ("http://idbhost1:1/,http://idbhost2:2/",
GetDisplayedIndexedDBs(cookies_model.get()));
EXPECT_EQ("", GetDisplayedServiceWorkers(cookies_model.get()));
- EXPECT_EQ(41, cookies_model->GetRoot()->GetTotalNodeCount());
+ EXPECT_EQ("https://cshost1:1/,https://cshost2:2/",
+ GetDisplayedCacheStorages(cookies_model.get()));
+ EXPECT_EQ("", GetDisplayedFlashLSOs(cookies_model.get()));
+ EXPECT_EQ(47, cookies_model->GetRoot()->GetTotalNodeCount());
}
- DeleteStoredObjects(cookies_model->GetRoot()->GetChild(11));
+ DeleteStoredObjects(cookies_model->GetRoot()->GetChild(13));
{
SCOPED_TRACE("`idbhost2` removed.");
EXPECT_STREQ("A,B,C", GetDisplayedCookies(cookies_model.get()).c_str());
@@ -678,9 +728,12 @@ TEST_F(CookiesTreeModelTest, Remove) {
EXPECT_EQ("http://idbhost1:1/",
GetDisplayedIndexedDBs(cookies_model.get()));
EXPECT_EQ("", GetDisplayedServiceWorkers(cookies_model.get()));
- EXPECT_EQ(38, cookies_model->GetRoot()->GetTotalNodeCount());
+ EXPECT_EQ("https://cshost1:1/,https://cshost2:2/",
+ GetDisplayedCacheStorages(cookies_model.get()));
+ EXPECT_EQ("", GetDisplayedFlashLSOs(cookies_model.get()));
+ EXPECT_EQ(44, cookies_model->GetRoot()->GetTotalNodeCount());
}
- DeleteStoredObjects(cookies_model->GetRoot()->GetChild(10));
+ DeleteStoredObjects(cookies_model->GetRoot()->GetChild(12));
{
SCOPED_TRACE("`idbhost1` removed.");
EXPECT_STREQ("A,B,C", GetDisplayedCookies(cookies_model.get()).c_str());
@@ -693,9 +746,12 @@ TEST_F(CookiesTreeModelTest, Remove) {
GetDisplayedFileSystems(cookies_model.get()));
EXPECT_EQ("", GetDisplayedIndexedDBs(cookies_model.get()));
EXPECT_EQ("", GetDisplayedServiceWorkers(cookies_model.get()));
- EXPECT_EQ(35, cookies_model->GetRoot()->GetTotalNodeCount());
+ EXPECT_EQ("https://cshost1:1/,https://cshost2:2/",
+ GetDisplayedCacheStorages(cookies_model.get()));
+ EXPECT_EQ("", GetDisplayedFlashLSOs(cookies_model.get()));
+ EXPECT_EQ(41, cookies_model->GetRoot()->GetTotalNodeCount());
}
- DeleteStoredObjects(cookies_model->GetRoot()->GetChild(9));
+ DeleteStoredObjects(cookies_model->GetRoot()->GetChild(11));
{
SCOPED_TRACE("`host2` removed.");
EXPECT_STREQ("A,B,C", GetDisplayedCookies(cookies_model.get()).c_str());
@@ -708,9 +764,12 @@ TEST_F(CookiesTreeModelTest, Remove) {
GetDisplayedFileSystems(cookies_model.get()));
EXPECT_EQ("", GetDisplayedIndexedDBs(cookies_model.get()));
EXPECT_EQ("", GetDisplayedServiceWorkers(cookies_model.get()));
- EXPECT_EQ(30, cookies_model->GetRoot()->GetTotalNodeCount());
+ EXPECT_EQ("https://cshost1:1/,https://cshost2:2/",
+ GetDisplayedCacheStorages(cookies_model.get()));
+ EXPECT_EQ("", GetDisplayedFlashLSOs(cookies_model.get()));
+ EXPECT_EQ(36, cookies_model->GetRoot()->GetTotalNodeCount());
}
- DeleteStoredObjects(cookies_model->GetRoot()->GetChild(8));
+ DeleteStoredObjects(cookies_model->GetRoot()->GetChild(10));
{
SCOPED_TRACE("`host1` removed.");
EXPECT_STREQ("A,B,C", GetDisplayedCookies(cookies_model.get()).c_str());
@@ -721,9 +780,12 @@ TEST_F(CookiesTreeModelTest, Remove) {
GetDisplayedFileSystems(cookies_model.get()));
EXPECT_EQ("", GetDisplayedIndexedDBs(cookies_model.get()));
EXPECT_EQ("", GetDisplayedServiceWorkers(cookies_model.get()));
- EXPECT_EQ(25, cookies_model->GetRoot()->GetTotalNodeCount());
+ EXPECT_EQ("https://cshost1:1/,https://cshost2:2/",
+ GetDisplayedCacheStorages(cookies_model.get()));
+ EXPECT_EQ("", GetDisplayedFlashLSOs(cookies_model.get()));
+ EXPECT_EQ(31, cookies_model->GetRoot()->GetTotalNodeCount());
}
- DeleteStoredObjects(cookies_model->GetRoot()->GetChild(7));
+ DeleteStoredObjects(cookies_model->GetRoot()->GetChild(9));
{
SCOPED_TRACE("`gdbhost2` removed.");
EXPECT_STREQ("A,B,C", GetDisplayedCookies(cookies_model.get()).c_str());
@@ -734,9 +796,12 @@ TEST_F(CookiesTreeModelTest, Remove) {
GetDisplayedFileSystems(cookies_model.get()));
EXPECT_EQ("", GetDisplayedIndexedDBs(cookies_model.get()));
EXPECT_EQ("", GetDisplayedServiceWorkers(cookies_model.get()));
- EXPECT_EQ(22, cookies_model->GetRoot()->GetTotalNodeCount());
+ EXPECT_EQ("https://cshost1:1/,https://cshost2:2/",
+ GetDisplayedCacheStorages(cookies_model.get()));
+ EXPECT_EQ("", GetDisplayedFlashLSOs(cookies_model.get()));
+ EXPECT_EQ(28, cookies_model->GetRoot()->GetTotalNodeCount());
}
- DeleteStoredObjects(cookies_model->GetRoot()->GetChild(6));
+ DeleteStoredObjects(cookies_model->GetRoot()->GetChild(8));
{
SCOPED_TRACE("`gdbhost1` removed.");
EXPECT_STREQ("A,B,C", GetDisplayedCookies(cookies_model.get()).c_str());
@@ -747,9 +812,12 @@ TEST_F(CookiesTreeModelTest, Remove) {
GetDisplayedFileSystems(cookies_model.get()));
EXPECT_EQ("", GetDisplayedIndexedDBs(cookies_model.get()));
EXPECT_EQ("", GetDisplayedServiceWorkers(cookies_model.get()));
- EXPECT_EQ(19, cookies_model->GetRoot()->GetTotalNodeCount());
+ EXPECT_EQ("https://cshost1:1/,https://cshost2:2/",
+ GetDisplayedCacheStorages(cookies_model.get()));
+ EXPECT_EQ("", GetDisplayedFlashLSOs(cookies_model.get()));
+ EXPECT_EQ(25, cookies_model->GetRoot()->GetTotalNodeCount());
}
- DeleteStoredObjects(cookies_model->GetRoot()->GetChild(5));
+ DeleteStoredObjects(cookies_model->GetRoot()->GetChild(7));
{
SCOPED_TRACE("`fshost3` removed.");
EXPECT_STREQ("A,B,C", GetDisplayedCookies(cookies_model.get()).c_str());
@@ -760,9 +828,12 @@ TEST_F(CookiesTreeModelTest, Remove) {
GetDisplayedFileSystems(cookies_model.get()));
EXPECT_EQ("", GetDisplayedIndexedDBs(cookies_model.get()));
EXPECT_EQ("", GetDisplayedServiceWorkers(cookies_model.get()));
- EXPECT_EQ(16, cookies_model->GetRoot()->GetTotalNodeCount());
+ EXPECT_EQ("https://cshost1:1/,https://cshost2:2/",
+ GetDisplayedCacheStorages(cookies_model.get()));
+ EXPECT_EQ("", GetDisplayedFlashLSOs(cookies_model.get()));
+ EXPECT_EQ(22, cookies_model->GetRoot()->GetTotalNodeCount());
}
- DeleteStoredObjects(cookies_model->GetRoot()->GetChild(4));
+ DeleteStoredObjects(cookies_model->GetRoot()->GetChild(6));
{
SCOPED_TRACE("`fshost2` removed.");
EXPECT_STREQ("A,B,C", GetDisplayedCookies(cookies_model.get()).c_str());
@@ -773,9 +844,12 @@ TEST_F(CookiesTreeModelTest, Remove) {
GetDisplayedFileSystems(cookies_model.get()));
EXPECT_EQ("", GetDisplayedIndexedDBs(cookies_model.get()));
EXPECT_EQ("", GetDisplayedServiceWorkers(cookies_model.get()));
- EXPECT_EQ(13, cookies_model->GetRoot()->GetTotalNodeCount());
+ EXPECT_EQ("https://cshost1:1/,https://cshost2:2/",
+ GetDisplayedCacheStorages(cookies_model.get()));
+ EXPECT_EQ("", GetDisplayedFlashLSOs(cookies_model.get()));
+ EXPECT_EQ(19, cookies_model->GetRoot()->GetTotalNodeCount());
}
- DeleteStoredObjects(cookies_model->GetRoot()->GetChild(3));
+ DeleteStoredObjects(cookies_model->GetRoot()->GetChild(5));
{
SCOPED_TRACE("`fshost1` removed.");
EXPECT_STREQ("A,B,C", GetDisplayedCookies(cookies_model.get()).c_str());
@@ -785,9 +859,12 @@ TEST_F(CookiesTreeModelTest, Remove) {
EXPECT_EQ("", GetDisplayedFileSystems(cookies_model.get()));
EXPECT_EQ("", GetDisplayedIndexedDBs(cookies_model.get()));
EXPECT_EQ("", GetDisplayedServiceWorkers(cookies_model.get()));
- EXPECT_EQ(10, cookies_model->GetRoot()->GetTotalNodeCount());
+ EXPECT_EQ("https://cshost1:1/,https://cshost2:2/",
+ GetDisplayedCacheStorages(cookies_model.get()));
+ EXPECT_EQ("", GetDisplayedFlashLSOs(cookies_model.get()));
+ EXPECT_EQ(16, cookies_model->GetRoot()->GetTotalNodeCount());
}
- DeleteStoredObjects(cookies_model->GetRoot()->GetChild(2));
+ DeleteStoredObjects(cookies_model->GetRoot()->GetChild(4));
{
SCOPED_TRACE("`foo3` removed.");
EXPECT_STREQ("A,B", GetDisplayedCookies(cookies_model.get()).c_str());
@@ -797,9 +874,12 @@ TEST_F(CookiesTreeModelTest, Remove) {
EXPECT_EQ("", GetDisplayedFileSystems(cookies_model.get()));
EXPECT_EQ("", GetDisplayedIndexedDBs(cookies_model.get()));
EXPECT_EQ("", GetDisplayedServiceWorkers(cookies_model.get()));
- EXPECT_EQ(7, cookies_model->GetRoot()->GetTotalNodeCount());
+ EXPECT_EQ("https://cshost1:1/,https://cshost2:2/",
+ GetDisplayedCacheStorages(cookies_model.get()));
+ EXPECT_EQ("", GetDisplayedFlashLSOs(cookies_model.get()));
+ EXPECT_EQ(13, cookies_model->GetRoot()->GetTotalNodeCount());
}
- DeleteStoredObjects(cookies_model->GetRoot()->GetChild(1));
+ DeleteStoredObjects(cookies_model->GetRoot()->GetChild(3));
{
SCOPED_TRACE("`foo2` removed.");
EXPECT_STREQ("A", GetDisplayedCookies(cookies_model.get()).c_str());
@@ -809,11 +889,44 @@ TEST_F(CookiesTreeModelTest, Remove) {
EXPECT_EQ("", GetDisplayedFileSystems(cookies_model.get()));
EXPECT_EQ("", GetDisplayedIndexedDBs(cookies_model.get()));
EXPECT_EQ("", GetDisplayedServiceWorkers(cookies_model.get()));
+ EXPECT_EQ("https://cshost1:1/,https://cshost2:2/",
+ GetDisplayedCacheStorages(cookies_model.get()));
+ EXPECT_EQ("", GetDisplayedFlashLSOs(cookies_model.get()));
+ EXPECT_EQ(10, cookies_model->GetRoot()->GetTotalNodeCount());
+ }
+ DeleteStoredObjects(cookies_model->GetRoot()->GetChild(2));
+ {
+ SCOPED_TRACE("`foo1` removed.");
+ EXPECT_STREQ("", GetDisplayedCookies(cookies_model.get()).c_str());
+ EXPECT_EQ("", GetDisplayedDatabases(cookies_model.get()));
+ EXPECT_EQ("", GetDisplayedLocalStorages(cookies_model.get()));
+ EXPECT_EQ("", GetDisplayedSessionStorages(cookies_model.get()));
+ EXPECT_EQ("", GetDisplayedFileSystems(cookies_model.get()));
+ EXPECT_EQ("", GetDisplayedIndexedDBs(cookies_model.get()));
+ EXPECT_EQ("", GetDisplayedServiceWorkers(cookies_model.get()));
+ EXPECT_EQ("https://cshost1:1/,https://cshost2:2/",
+ GetDisplayedCacheStorages(cookies_model.get()));
+ EXPECT_EQ("", GetDisplayedFlashLSOs(cookies_model.get()));
+ EXPECT_EQ(7, cookies_model->GetRoot()->GetTotalNodeCount());
+ }
+ DeleteStoredObjects(cookies_model->GetRoot()->GetChild(1));
+ {
+ SCOPED_TRACE("`cshost2` removed.");
+ EXPECT_STREQ("", GetDisplayedCookies(cookies_model.get()).c_str());
+ EXPECT_EQ("", GetDisplayedDatabases(cookies_model.get()));
+ EXPECT_EQ("", GetDisplayedLocalStorages(cookies_model.get()));
+ EXPECT_EQ("", GetDisplayedSessionStorages(cookies_model.get()));
+ EXPECT_EQ("", GetDisplayedFileSystems(cookies_model.get()));
+ EXPECT_EQ("", GetDisplayedIndexedDBs(cookies_model.get()));
+ EXPECT_EQ("", GetDisplayedServiceWorkers(cookies_model.get()));
+ EXPECT_EQ("https://cshost1:1/",
+ GetDisplayedCacheStorages(cookies_model.get()));
+ EXPECT_EQ("", GetDisplayedFlashLSOs(cookies_model.get()));
EXPECT_EQ(4, cookies_model->GetRoot()->GetTotalNodeCount());
}
DeleteStoredObjects(cookies_model->GetRoot()->GetChild(0));
{
- SCOPED_TRACE("`foo1` removed.");
+ SCOPED_TRACE("`cshost1` removed.");
EXPECT_STREQ("", GetDisplayedCookies(cookies_model.get()).c_str());
EXPECT_EQ("", GetDisplayedDatabases(cookies_model.get()));
EXPECT_EQ("", GetDisplayedLocalStorages(cookies_model.get()));
@@ -821,6 +934,8 @@ TEST_F(CookiesTreeModelTest, Remove) {
EXPECT_EQ("", GetDisplayedFileSystems(cookies_model.get()));
EXPECT_EQ("", GetDisplayedIndexedDBs(cookies_model.get()));
EXPECT_EQ("", GetDisplayedServiceWorkers(cookies_model.get()));
+ EXPECT_EQ("", GetDisplayedCacheStorages(cookies_model.get()));
+ EXPECT_EQ("", GetDisplayedFlashLSOs(cookies_model.get()));
EXPECT_EQ(1, cookies_model->GetRoot()->GetTotalNodeCount());
}
}
@@ -829,14 +944,13 @@ TEST_F(CookiesTreeModelTest, RemoveCookiesNode) {
scoped_ptr<CookiesTreeModel> cookies_model(
CreateCookiesTreeModelWithInitialSample());
- DeleteStoredObjects(
- cookies_model->GetRoot()->GetChild(0)->GetChild(0));
+ DeleteStoredObjects(cookies_model->GetRoot()->GetChild(2)->GetChild(0));
{
- SCOPED_TRACE("First origin removed");
+ SCOPED_TRACE("First cookies origin removed");
EXPECT_STREQ("B,C", GetDisplayedCookies(cookies_model.get()).c_str());
- // 57 because in this case, the origin remains, although the COOKIES
+ // 63 because in this case, the origin remains, although the COOKIES
// node beneath it has been deleted.
- EXPECT_EQ(57, cookies_model->GetRoot()->GetTotalNodeCount());
+ EXPECT_EQ(63, cookies_model->GetRoot()->GetTotalNodeCount());
EXPECT_EQ("db1,db2", GetDisplayedDatabases(cookies_model.get()));
EXPECT_EQ("http://host1:1/,http://host2:2/",
GetDisplayedLocalStorages(cookies_model.get()));
@@ -850,12 +964,13 @@ TEST_F(CookiesTreeModelTest, RemoveCookiesNode) {
EXPECT_EQ("sbc1,sbc2", GetDisplayedChannelIDs(cookies_model.get()));
EXPECT_EQ("https://swhost1:1/,https://swhost2:2/",
GetDisplayedServiceWorkers(cookies_model.get()));
+ EXPECT_EQ("https://cshost1:1/,https://cshost2:2/",
+ GetDisplayedCacheStorages(cookies_model.get()));
}
- DeleteStoredObjects(
- cookies_model->GetRoot()->GetChild(6)->GetChild(0));
+ DeleteStoredObjects(cookies_model->GetRoot()->GetChild(8)->GetChild(0));
{
- SCOPED_TRACE("First database removed");
+ SCOPED_TRACE("First database origin removed");
EXPECT_STREQ("B,C", GetDisplayedCookies(cookies_model.get()).c_str());
EXPECT_EQ("db2", GetDisplayedDatabases(cookies_model.get()));
EXPECT_EQ("http://host1:1/,http://host2:2/",
@@ -870,13 +985,14 @@ TEST_F(CookiesTreeModelTest, RemoveCookiesNode) {
EXPECT_EQ("sbc1,sbc2", GetDisplayedChannelIDs(cookies_model.get()));
EXPECT_EQ("https://swhost1:1/,https://swhost2:2/",
GetDisplayedServiceWorkers(cookies_model.get()));
- EXPECT_EQ(55, cookies_model->GetRoot()->GetTotalNodeCount());
+ EXPECT_EQ("https://cshost1:1/,https://cshost2:2/",
+ GetDisplayedCacheStorages(cookies_model.get()));
+ EXPECT_EQ(61, cookies_model->GetRoot()->GetTotalNodeCount());
}
- DeleteStoredObjects(
- cookies_model->GetRoot()->GetChild(8)->GetChild(0));
+ DeleteStoredObjects(cookies_model->GetRoot()->GetChild(10)->GetChild(0));
{
- SCOPED_TRACE("First origin removed");
+ SCOPED_TRACE("First local storage origin removed");
EXPECT_STREQ("B,C", GetDisplayedCookies(cookies_model.get()).c_str());
EXPECT_EQ("db2", GetDisplayedDatabases(cookies_model.get()));
EXPECT_EQ("http://host2:2/",
@@ -891,7 +1007,9 @@ TEST_F(CookiesTreeModelTest, RemoveCookiesNode) {
EXPECT_EQ("sbc1,sbc2", GetDisplayedChannelIDs(cookies_model.get()));
EXPECT_EQ("https://swhost1:1/,https://swhost2:2/",
GetDisplayedServiceWorkers(cookies_model.get()));
- EXPECT_EQ(53, cookies_model->GetRoot()->GetTotalNodeCount());
+ EXPECT_EQ("https://cshost1:1/,https://cshost2:2/",
+ GetDisplayedCacheStorages(cookies_model.get()));
+ EXPECT_EQ(59, cookies_model->GetRoot()->GetTotalNodeCount());
}
}
@@ -899,8 +1017,7 @@ TEST_F(CookiesTreeModelTest, RemoveCookieNode) {
scoped_ptr<CookiesTreeModel> cookies_model(
CreateCookiesTreeModelWithInitialSample());
- DeleteStoredObjects(
- cookies_model->GetRoot()->GetChild(1)->GetChild(0));
+ DeleteStoredObjects(cookies_model->GetRoot()->GetChild(3)->GetChild(0));
{
SCOPED_TRACE("Second origin COOKIES node removed");
EXPECT_STREQ("A,C", GetDisplayedCookies(cookies_model.get()).c_str());
@@ -917,15 +1034,16 @@ TEST_F(CookiesTreeModelTest, RemoveCookieNode) {
EXPECT_EQ("sbc1,sbc2", GetDisplayedChannelIDs(cookies_model.get()));
EXPECT_EQ("https://swhost1:1/,https://swhost2:2/",
GetDisplayedServiceWorkers(cookies_model.get()));
- // 57 because in this case, the origin remains, although the COOKIES
+ EXPECT_EQ("https://cshost1:1/,https://cshost2:2/",
+ GetDisplayedCacheStorages(cookies_model.get()));
+ // 63 because in this case, the origin remains, although the COOKIES
// node beneath it has been deleted.
- EXPECT_EQ(57, cookies_model->GetRoot()->GetTotalNodeCount());
+ EXPECT_EQ(63, cookies_model->GetRoot()->GetTotalNodeCount());
}
- DeleteStoredObjects(
- cookies_model->GetRoot()->GetChild(6)->GetChild(0));
+ DeleteStoredObjects(cookies_model->GetRoot()->GetChild(8)->GetChild(0));
{
- SCOPED_TRACE("First database removed");
+ SCOPED_TRACE("First database origin removed");
EXPECT_STREQ("A,C", GetDisplayedCookies(cookies_model.get()).c_str());
EXPECT_EQ("db2", GetDisplayedDatabases(cookies_model.get()));
EXPECT_EQ("http://host1:1/,http://host2:2/",
@@ -940,13 +1058,14 @@ TEST_F(CookiesTreeModelTest, RemoveCookieNode) {
EXPECT_EQ("sbc1,sbc2", GetDisplayedChannelIDs(cookies_model.get()));
EXPECT_EQ("https://swhost1:1/,https://swhost2:2/",
GetDisplayedServiceWorkers(cookies_model.get()));
- EXPECT_EQ(55, cookies_model->GetRoot()->GetTotalNodeCount());
+ EXPECT_EQ("https://cshost1:1/,https://cshost2:2/",
+ GetDisplayedCacheStorages(cookies_model.get()));
+ EXPECT_EQ(61, cookies_model->GetRoot()->GetTotalNodeCount());
}
- DeleteStoredObjects(
- cookies_model->GetRoot()->GetChild(8)->GetChild(0));
+ DeleteStoredObjects(cookies_model->GetRoot()->GetChild(10)->GetChild(0));
{
- SCOPED_TRACE("First origin removed");
+ SCOPED_TRACE("First local storage origin removed");
EXPECT_STREQ("A,C", GetDisplayedCookies(cookies_model.get()).c_str());
EXPECT_EQ("db2", GetDisplayedDatabases(cookies_model.get()));
EXPECT_EQ("http://host2:2/",
@@ -961,7 +1080,9 @@ TEST_F(CookiesTreeModelTest, RemoveCookieNode) {
EXPECT_EQ("sbc1,sbc2", GetDisplayedChannelIDs(cookies_model.get()));
EXPECT_EQ("https://swhost1:1/,https://swhost2:2/",
GetDisplayedServiceWorkers(cookies_model.get()));
- EXPECT_EQ(53, cookies_model->GetRoot()->GetTotalNodeCount());
+ EXPECT_EQ("https://cshost1:1/,https://cshost2:2/",
+ GetDisplayedCacheStorages(cookies_model.get()));
+ EXPECT_EQ(59, cookies_model->GetRoot()->GetTotalNodeCount());
}
}
@@ -977,6 +1098,7 @@ TEST_F(CookiesTreeModelTest, RemoveSingleCookieNode) {
mock_browsing_data_quota_helper_.get(),
mock_browsing_data_channel_id_helper_.get(),
mock_browsing_data_service_worker_helper_.get(),
+ mock_browsing_data_cache_storage_helper_.get(),
mock_browsing_data_flash_lso_helper_.get());
CookiesTreeModel cookies_model(container, special_storage_policy(), false);
@@ -1003,12 +1125,17 @@ TEST_F(CookiesTreeModelTest, RemoveSingleCookieNode) {
mock_browsing_data_quota_helper_->Notify();
mock_browsing_data_service_worker_helper_->AddServiceWorkerSamples();
mock_browsing_data_service_worker_helper_->Notify();
+ mock_browsing_data_cache_storage_helper_->AddCacheStorageSamples();
+ mock_browsing_data_cache_storage_helper_->Notify();
{
- SCOPED_TRACE("Initial State 4 cookies, 2 databases, 2 local storages, "
- "2 session storages, 2 indexed DBs, 3 file systems, "
- "2 quotas, 2 service workers.");
- // 52 because there's the root, then
+ SCOPED_TRACE(
+ "Initial State 4 cookies, 2 databases, 2 local storages, "
+ "2 session storages, 2 indexed DBs, 3 file systems, "
+ "2 quotas, 2 service workers, 2 caches.");
+ // 58 because there's the root, then
+ // cshost1 -> cache storage -> https://cshost1:1/
+ // cshost2 -> cache storage -> https://cshost2:2/
// foo1 -> cookies -> a,
// foo2 -> cookies -> b,
// foo3 -> cookies -> c,d
@@ -1027,7 +1154,7 @@ TEST_F(CookiesTreeModelTest, RemoveSingleCookieNode) {
// quotahost2 -> quotahost2.
// swhost1 -> service worker -> https://swhost1:1
// swhost2 -> service worker -> https://swhost1:2
- EXPECT_EQ(52, cookies_model.GetRoot()->GetTotalNodeCount());
+ EXPECT_EQ(58, cookies_model.GetRoot()->GetTotalNodeCount());
EXPECT_STREQ("A,B,C,D", GetDisplayedCookies(&cookies_model).c_str());
EXPECT_EQ("db1,db2", GetDisplayedDatabases(&cookies_model));
EXPECT_EQ("http://host1:1/,http://host2:2/",
@@ -1041,10 +1168,12 @@ TEST_F(CookiesTreeModelTest, RemoveSingleCookieNode) {
EXPECT_EQ("quotahost1,quotahost2", GetDisplayedQuotas(&cookies_model));
EXPECT_EQ("https://swhost1:1/,https://swhost2:2/",
GetDisplayedServiceWorkers(&cookies_model));
+ EXPECT_EQ("https://cshost1:1/,https://cshost2:2/",
+ GetDisplayedCacheStorages(&cookies_model));
}
- DeleteStoredObjects(cookies_model.GetRoot()->GetChild(2));
+ DeleteStoredObjects(cookies_model.GetRoot()->GetChild(4));
{
- SCOPED_TRACE("Third origin removed");
+ SCOPED_TRACE("Third cookie origin removed");
EXPECT_STREQ("A,B", GetDisplayedCookies(&cookies_model).c_str());
EXPECT_EQ("db1,db2", GetDisplayedDatabases(&cookies_model));
EXPECT_EQ("http://host1:1/,http://host2:2/",
@@ -1058,7 +1187,9 @@ TEST_F(CookiesTreeModelTest, RemoveSingleCookieNode) {
EXPECT_EQ("quotahost1,quotahost2", GetDisplayedQuotas(&cookies_model));
EXPECT_EQ("https://swhost1:1/,https://swhost2:2/",
GetDisplayedServiceWorkers(&cookies_model));
- EXPECT_EQ(48, cookies_model.GetRoot()->GetTotalNodeCount());
+ EXPECT_EQ("https://cshost1:1/,https://cshost2:2/",
+ GetDisplayedCacheStorages(&cookies_model));
+ EXPECT_EQ(54, cookies_model.GetRoot()->GetTotalNodeCount());
}
}
@@ -1074,6 +1205,7 @@ TEST_F(CookiesTreeModelTest, RemoveSingleCookieNodeOf3) {
mock_browsing_data_quota_helper_.get(),
mock_browsing_data_channel_id_helper_.get(),
mock_browsing_data_service_worker_helper_.get(),
+ mock_browsing_data_cache_storage_helper_.get(),
mock_browsing_data_flash_lso_helper_.get());
CookiesTreeModel cookies_model(container, special_storage_policy(), false);
@@ -1102,12 +1234,17 @@ TEST_F(CookiesTreeModelTest, RemoveSingleCookieNodeOf3) {
mock_browsing_data_quota_helper_->Notify();
mock_browsing_data_service_worker_helper_->AddServiceWorkerSamples();
mock_browsing_data_service_worker_helper_->Notify();
+ mock_browsing_data_cache_storage_helper_->AddCacheStorageSamples();
+ mock_browsing_data_cache_storage_helper_->Notify();
{
- SCOPED_TRACE("Initial State 5 cookies, 2 databases, 2 local storages, "
- "2 session storages, 2 indexed DBs, 3 filesystems, "
- "2 quotas, 2 service workers.");
- // 53 because there's the root, then
+ SCOPED_TRACE(
+ "Initial State 5 cookies, 2 databases, 2 local storages, "
+ "2 session storages, 2 indexed DBs, 3 filesystems, "
+ "2 quotas, 2 service workers, 2 caches.");
+ // 59 because there's the root, then
+ // cshost1 -> cache storage -> https://cshost1:1/
+ // cshost2 -> cache storage -> https://cshost2:2/
// foo1 -> cookies -> a,
// foo2 -> cookies -> b,
// foo3 -> cookies -> c,d,e
@@ -1126,7 +1263,7 @@ TEST_F(CookiesTreeModelTest, RemoveSingleCookieNodeOf3) {
// quotahost2 -> quotahost2.
// swhost1 -> service worker -> https://swhost1:1
// swhost2 -> service worker -> https://swhost1:2
- EXPECT_EQ(53, cookies_model.GetRoot()->GetTotalNodeCount());
+ EXPECT_EQ(59, cookies_model.GetRoot()->GetTotalNodeCount());
EXPECT_STREQ("A,B,C,D,E", GetDisplayedCookies(&cookies_model).c_str());
EXPECT_EQ("db1,db2", GetDisplayedDatabases(&cookies_model));
EXPECT_EQ("http://host1:1/,http://host2:2/",
@@ -1140,13 +1277,15 @@ TEST_F(CookiesTreeModelTest, RemoveSingleCookieNodeOf3) {
EXPECT_EQ("quotahost1,quotahost2", GetDisplayedQuotas(&cookies_model));
EXPECT_EQ("https://swhost1:1/,https://swhost2:2/",
GetDisplayedServiceWorkers(&cookies_model));
+ EXPECT_EQ("https://cshost1:1/,https://cshost2:2/",
+ GetDisplayedCacheStorages(&cookies_model));
}
- DeleteStoredObjects(cookies_model.GetRoot()->GetChild(2)->GetChild(0)->
- GetChild(1));
+ DeleteStoredObjects(
+ cookies_model.GetRoot()->GetChild(4)->GetChild(0)->GetChild(1));
{
- SCOPED_TRACE("Middle cookie in third origin removed");
+ SCOPED_TRACE("Middle cookie in third cookie origin removed");
EXPECT_STREQ("A,B,C,E", GetDisplayedCookies(&cookies_model).c_str());
- EXPECT_EQ(52, cookies_model.GetRoot()->GetTotalNodeCount());
+ EXPECT_EQ(58, cookies_model.GetRoot()->GetTotalNodeCount());
EXPECT_EQ("db1,db2", GetDisplayedDatabases(&cookies_model));
EXPECT_EQ("http://host1:1/,http://host2:2/",
GetDisplayedLocalStorages(&cookies_model));
@@ -1159,6 +1298,8 @@ TEST_F(CookiesTreeModelTest, RemoveSingleCookieNodeOf3) {
EXPECT_EQ("quotahost1,quotahost2", GetDisplayedQuotas(&cookies_model));
EXPECT_EQ("https://swhost1:1/,https://swhost2:2/",
GetDisplayedServiceWorkers(&cookies_model));
+ EXPECT_EQ("https://cshost1:1/,https://cshost2:2/",
+ GetDisplayedCacheStorages(&cookies_model));
}
}
@@ -1174,6 +1315,7 @@ TEST_F(CookiesTreeModelTest, RemoveSecondOrigin) {
mock_browsing_data_quota_helper_.get(),
mock_browsing_data_channel_id_helper_.get(),
mock_browsing_data_service_worker_helper_.get(),
+ mock_browsing_data_cache_storage_helper_.get(),
mock_browsing_data_flash_lso_helper_.get());
CookiesTreeModel cookies_model(container, special_storage_policy(), false);
@@ -1217,6 +1359,7 @@ TEST_F(CookiesTreeModelTest, OriginOrdering) {
mock_browsing_data_quota_helper_.get(),
mock_browsing_data_channel_id_helper_.get(),
mock_browsing_data_service_worker_helper_.get(),
+ mock_browsing_data_cache_storage_helper_.get(),
mock_browsing_data_flash_lso_helper_.get());
CookiesTreeModel cookies_model(container, special_storage_policy(), false);
@@ -1265,6 +1408,7 @@ TEST_F(CookiesTreeModelTest, ContentSettings) {
mock_browsing_data_quota_helper_.get(),
mock_browsing_data_channel_id_helper_.get(),
mock_browsing_data_service_worker_helper_.get(),
+ mock_browsing_data_cache_storage_helper_.get(),
mock_browsing_data_flash_lso_helper_.get());
CookiesTreeModel cookies_model(container, special_storage_policy(), false);
@@ -1347,6 +1491,26 @@ TEST_F(CookiesTreeModelTest, ServiceWorkerFilter) {
GetDisplayedServiceWorkers(cookies_model.get()));
}
+TEST_F(CookiesTreeModelTest, CacheStorageFilter) {
+ scoped_ptr<CookiesTreeModel> cookies_model(
+ CreateCookiesTreeModelWithInitialSample());
+
+ cookies_model->UpdateSearchResults(base::ASCIIToUTF16("cshost1"));
+ EXPECT_EQ("https://cshost1:1/",
+ GetDisplayedCacheStorages(cookies_model.get()));
+
+ cookies_model->UpdateSearchResults(base::ASCIIToUTF16("cshost2"));
+ EXPECT_EQ("https://cshost2:2/",
+ GetDisplayedCacheStorages(cookies_model.get()));
+
+ cookies_model->UpdateSearchResults(base::ASCIIToUTF16("cshost3"));
+ EXPECT_EQ("", GetDisplayedCacheStorages(cookies_model.get()));
+
+ cookies_model->UpdateSearchResults(base::string16());
+ EXPECT_EQ("https://cshost1:1/,https://cshost2:2/",
+ GetDisplayedCacheStorages(cookies_model.get()));
+}
+
TEST_F(CookiesTreeModelTest, CookiesFilter) {
LocalDataContainer* container =
new LocalDataContainer(mock_browsing_data_cookie_helper_.get(),
@@ -1359,6 +1523,7 @@ TEST_F(CookiesTreeModelTest, CookiesFilter) {
mock_browsing_data_quota_helper_.get(),
mock_browsing_data_channel_id_helper_.get(),
mock_browsing_data_service_worker_helper_.get(),
+ mock_browsing_data_cache_storage_helper_.get(),
mock_browsing_data_flash_lso_helper_.get());
CookiesTreeModel cookies_model(container, special_storage_policy(), false);
@@ -1400,6 +1565,7 @@ TEST_F(CookiesTreeModelTest, CanonicalizeCookieSource) {
mock_browsing_data_quota_helper_.get(),
mock_browsing_data_channel_id_helper_.get(),
mock_browsing_data_service_worker_helper_.get(),
+ mock_browsing_data_cache_storage_helper_.get(),
mock_browsing_data_flash_lso_helper_.get());
CookiesTreeModel cookies_model(container, special_storage_policy(),
true /* group by cookie source */);
« no previous file with comments | « chrome/browser/browsing_data/cookies_tree_model.cc ('k') | chrome/browser/browsing_data/local_data_container.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698