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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/cookies_tree_model_unittest.cc

Issue 10536017: Refactoring CookiesTreeModel to support multiple data sources. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Mostly working, just need to refresh properly on Remove All Created 8 years, 6 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
« chrome/browser/cookies_tree_model.cc ('K') | « chrome/browser/cookies_tree_model.cc ('k') | chrome/browser/resources/options2/cookies_list.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/cookies_tree_model_unittest.cc
diff --git a/chrome/browser/cookies_tree_model_unittest.cc b/chrome/browser/cookies_tree_model_unittest.cc
index 86da86350228e2a43751ca4657e5050fdfeb071b..3155e47b178154ebdd1637cfc51efe47167e64f4 100644
--- a/chrome/browser/cookies_tree_model_unittest.cc
+++ b/chrome/browser/cookies_tree_model_unittest.cc
@@ -83,7 +83,10 @@ class CookiesTreeModelTest : public testing::Test {
}
CookiesTreeModel* CreateCookiesTreeModelWithInitialSample() {
- CookiesTreeModel* cookies_model = new CookiesTreeModel(
+ string16 name = ASCIIToUTF16("Drive-By-Web");
+ string16 id = ASCIIToUTF16("");
+ LocalDataContainer* container = new LocalDataContainer(
+ name, id,
mock_browsing_data_cookie_helper_,
mock_browsing_data_database_helper_,
mock_browsing_data_local_storage_helper_,
@@ -94,6 +97,10 @@ class CookiesTreeModelTest : public testing::Test {
mock_browsing_data_quota_helper_,
mock_browsing_data_server_bound_cert_helper_,
false);
+ ContainerMap containers_map;
+ containers_map[id] = container;
+ CookiesTreeModel* cookies_model = new CookiesTreeModel(containers_map);
+
mock_browsing_data_cookie_helper_->
AddCookieSamples(GURL("http://foo1"), "A=1");
mock_browsing_data_cookie_helper_->
@@ -138,7 +145,7 @@ class CookiesTreeModelTest : public testing::Test {
// quotahost2 -> quotahost2,
// sbc1 -> sbcerts -> sbc1,
// sbc2 -> sbcerts -> sbc2.
- EXPECT_EQ(51, cookies_model->GetRoot()->GetTotalNodeCount());
+ EXPECT_EQ(52, 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/",
@@ -366,9 +373,10 @@ TEST_F(CookiesTreeModelTest, RemoveAll) {
cookies_model->UpdateSearchResults(std::wstring());
{
+ // 2 nodes - root and app
SCOPED_TRACE("After removing");
- EXPECT_EQ(1, cookies_model->GetRoot()->GetTotalNodeCount());
- EXPECT_EQ(0, cookies_model->GetRoot()->child_count());
+ EXPECT_EQ(2, cookies_model->GetRoot()->GetTotalNodeCount());
+ EXPECT_EQ(1, cookies_model->GetRoot()->child_count());
EXPECT_EQ(std::string(""), GetDisplayedCookies(cookies_model.get()));
EXPECT_TRUE(mock_browsing_data_cookie_helper_->AllDeleted());
EXPECT_TRUE(mock_browsing_data_database_helper_->AllDeleted());
@@ -406,7 +414,7 @@ TEST_F(CookiesTreeModelTest, Remove) {
// Here, we'll remove them one by one, starting from the end, and
// check that the state makes sense.
- DeleteStoredObjects(cookies_model->GetRoot()->GetChild(15));
+ DeleteStoredObjects(cookies_model->GetRoot()->GetChild(0)->GetChild(15));
{
SCOPED_TRACE("`sbc2` removed.");
EXPECT_STREQ("A,B,C", GetDisplayedCookies(cookies_model.get()).c_str());
@@ -423,9 +431,9 @@ TEST_F(CookiesTreeModelTest, Remove) {
GetDisplayedQuotas(cookies_model.get()));
EXPECT_EQ("sbc1",
GetDisplayedServerBoundCerts(cookies_model.get()));
- EXPECT_EQ(48, cookies_model->GetRoot()->GetTotalNodeCount());
+ EXPECT_EQ(49, cookies_model->GetRoot()->GetTotalNodeCount());
}
- DeleteStoredObjects(cookies_model->GetRoot()->GetChild(14));
+ DeleteStoredObjects(cookies_model->GetRoot()->GetChild(0)->GetChild(14));
{
SCOPED_TRACE("`sbc1` removed.");
EXPECT_STREQ("A,B,C", GetDisplayedCookies(cookies_model.get()).c_str());
@@ -440,9 +448,9 @@ TEST_F(CookiesTreeModelTest, Remove) {
GetDisplayedIndexedDBs(cookies_model.get()));
EXPECT_EQ("quotahost1,quotahost2",
GetDisplayedQuotas(cookies_model.get()));
- EXPECT_EQ(45, cookies_model->GetRoot()->GetTotalNodeCount());
+ EXPECT_EQ(46, cookies_model->GetRoot()->GetTotalNodeCount());
}
- DeleteStoredObjects(cookies_model->GetRoot()->GetChild(13));
+ DeleteStoredObjects(cookies_model->GetRoot()->GetChild(0)->GetChild(13));
{
SCOPED_TRACE("`quotahost2` removed.");
EXPECT_STREQ("A,B,C", GetDisplayedCookies(cookies_model.get()).c_str());
@@ -457,9 +465,9 @@ TEST_F(CookiesTreeModelTest, Remove) {
GetDisplayedIndexedDBs(cookies_model.get()));
EXPECT_EQ("quotahost1",
GetDisplayedQuotas(cookies_model.get()));
- EXPECT_EQ(43, cookies_model->GetRoot()->GetTotalNodeCount());
+ EXPECT_EQ(44, cookies_model->GetRoot()->GetTotalNodeCount());
}
- DeleteStoredObjects(cookies_model->GetRoot()->GetChild(12));
+ DeleteStoredObjects(cookies_model->GetRoot()->GetChild(0)->GetChild(12));
{
SCOPED_TRACE("`quotahost1` removed.");
EXPECT_STREQ("A,B,C", GetDisplayedCookies(cookies_model.get()).c_str());
@@ -472,9 +480,9 @@ TEST_F(CookiesTreeModelTest, Remove) {
GetDisplayedFileSystems(cookies_model.get()));
EXPECT_EQ("http://idbhost1:1/,http://idbhost2:2/",
GetDisplayedIndexedDBs(cookies_model.get()));
- EXPECT_EQ(41, cookies_model->GetRoot()->GetTotalNodeCount());
+ EXPECT_EQ(42, cookies_model->GetRoot()->GetTotalNodeCount());
}
- DeleteStoredObjects(cookies_model->GetRoot()->GetChild(11));
+ DeleteStoredObjects(cookies_model->GetRoot()->GetChild(0)->GetChild(11));
{
SCOPED_TRACE("`idbhost2` removed.");
EXPECT_STREQ("A,B,C", GetDisplayedCookies(cookies_model.get()).c_str());
@@ -487,9 +495,9 @@ TEST_F(CookiesTreeModelTest, Remove) {
GetDisplayedFileSystems(cookies_model.get()));
EXPECT_EQ("http://idbhost1:1/",
GetDisplayedIndexedDBs(cookies_model.get()));
- EXPECT_EQ(38, cookies_model->GetRoot()->GetTotalNodeCount());
+ EXPECT_EQ(39, cookies_model->GetRoot()->GetTotalNodeCount());
}
- DeleteStoredObjects(cookies_model->GetRoot()->GetChild(10));
+ DeleteStoredObjects(cookies_model->GetRoot()->GetChild(0)->GetChild(10));
{
SCOPED_TRACE("`idbhost1` removed.");
EXPECT_STREQ("A,B,C", GetDisplayedCookies(cookies_model.get()).c_str());
@@ -501,9 +509,9 @@ TEST_F(CookiesTreeModelTest, Remove) {
EXPECT_EQ("http://fshost1:1/,http://fshost2:2/,http://fshost3:3/",
GetDisplayedFileSystems(cookies_model.get()));
EXPECT_EQ("", GetDisplayedIndexedDBs(cookies_model.get()));
- EXPECT_EQ(35, cookies_model->GetRoot()->GetTotalNodeCount());
+ EXPECT_EQ(36, cookies_model->GetRoot()->GetTotalNodeCount());
}
- DeleteStoredObjects(cookies_model->GetRoot()->GetChild(9));
+ DeleteStoredObjects(cookies_model->GetRoot()->GetChild(0)->GetChild(9));
{
SCOPED_TRACE("`host2` removed.");
EXPECT_STREQ("A,B,C", GetDisplayedCookies(cookies_model.get()).c_str());
@@ -515,9 +523,9 @@ TEST_F(CookiesTreeModelTest, Remove) {
EXPECT_EQ("http://fshost1:1/,http://fshost2:2/,http://fshost3:3/",
GetDisplayedFileSystems(cookies_model.get()));
EXPECT_EQ("", GetDisplayedIndexedDBs(cookies_model.get()));
- EXPECT_EQ(30, cookies_model->GetRoot()->GetTotalNodeCount());
+ EXPECT_EQ(31, cookies_model->GetRoot()->GetTotalNodeCount());
}
- DeleteStoredObjects(cookies_model->GetRoot()->GetChild(8));
+ DeleteStoredObjects(cookies_model->GetRoot()->GetChild(0)->GetChild(8));
{
SCOPED_TRACE("`host1` removed.");
EXPECT_STREQ("A,B,C", GetDisplayedCookies(cookies_model.get()).c_str());
@@ -527,9 +535,9 @@ TEST_F(CookiesTreeModelTest, Remove) {
EXPECT_EQ("http://fshost1:1/,http://fshost2:2/,http://fshost3:3/",
GetDisplayedFileSystems(cookies_model.get()));
EXPECT_EQ("", GetDisplayedIndexedDBs(cookies_model.get()));
- EXPECT_EQ(25, cookies_model->GetRoot()->GetTotalNodeCount());
+ EXPECT_EQ(26, cookies_model->GetRoot()->GetTotalNodeCount());
}
- DeleteStoredObjects(cookies_model->GetRoot()->GetChild(7));
+ DeleteStoredObjects(cookies_model->GetRoot()->GetChild(0)->GetChild(7));
{
SCOPED_TRACE("`gdbhost2` removed.");
EXPECT_STREQ("A,B,C", GetDisplayedCookies(cookies_model.get()).c_str());
@@ -539,9 +547,9 @@ TEST_F(CookiesTreeModelTest, Remove) {
EXPECT_EQ("http://fshost1:1/,http://fshost2:2/,http://fshost3:3/",
GetDisplayedFileSystems(cookies_model.get()));
EXPECT_EQ("", GetDisplayedIndexedDBs(cookies_model.get()));
- EXPECT_EQ(22, cookies_model->GetRoot()->GetTotalNodeCount());
+ EXPECT_EQ(23, cookies_model->GetRoot()->GetTotalNodeCount());
}
- DeleteStoredObjects(cookies_model->GetRoot()->GetChild(6));
+ DeleteStoredObjects(cookies_model->GetRoot()->GetChild(0)->GetChild(6));
{
SCOPED_TRACE("`gdbhost1` removed.");
EXPECT_STREQ("A,B,C", GetDisplayedCookies(cookies_model.get()).c_str());
@@ -551,9 +559,9 @@ TEST_F(CookiesTreeModelTest, Remove) {
EXPECT_EQ("http://fshost1:1/,http://fshost2:2/,http://fshost3:3/",
GetDisplayedFileSystems(cookies_model.get()));
EXPECT_EQ("", GetDisplayedIndexedDBs(cookies_model.get()));
- EXPECT_EQ(19, cookies_model->GetRoot()->GetTotalNodeCount());
+ EXPECT_EQ(20, cookies_model->GetRoot()->GetTotalNodeCount());
}
- DeleteStoredObjects(cookies_model->GetRoot()->GetChild(5));
+ DeleteStoredObjects(cookies_model->GetRoot()->GetChild(0)->GetChild(5));
{
SCOPED_TRACE("`fshost3` removed.");
EXPECT_STREQ("A,B,C", GetDisplayedCookies(cookies_model.get()).c_str());
@@ -563,9 +571,9 @@ TEST_F(CookiesTreeModelTest, Remove) {
EXPECT_EQ("http://fshost1:1/,http://fshost2:2/",
GetDisplayedFileSystems(cookies_model.get()));
EXPECT_EQ("", GetDisplayedIndexedDBs(cookies_model.get()));
- EXPECT_EQ(16, cookies_model->GetRoot()->GetTotalNodeCount());
+ EXPECT_EQ(17, cookies_model->GetRoot()->GetTotalNodeCount());
}
- DeleteStoredObjects(cookies_model->GetRoot()->GetChild(4));
+ DeleteStoredObjects(cookies_model->GetRoot()->GetChild(0)->GetChild(4));
{
SCOPED_TRACE("`fshost2` removed.");
EXPECT_STREQ("A,B,C", GetDisplayedCookies(cookies_model.get()).c_str());
@@ -575,9 +583,9 @@ TEST_F(CookiesTreeModelTest, Remove) {
EXPECT_EQ("http://fshost1:1/",
GetDisplayedFileSystems(cookies_model.get()));
EXPECT_EQ("", GetDisplayedIndexedDBs(cookies_model.get()));
- EXPECT_EQ(13, cookies_model->GetRoot()->GetTotalNodeCount());
+ EXPECT_EQ(14, cookies_model->GetRoot()->GetTotalNodeCount());
}
- DeleteStoredObjects(cookies_model->GetRoot()->GetChild(3));
+ DeleteStoredObjects(cookies_model->GetRoot()->GetChild(0)->GetChild(3));
{
SCOPED_TRACE("`fshost1` removed.");
EXPECT_STREQ("A,B,C", GetDisplayedCookies(cookies_model.get()).c_str());
@@ -586,9 +594,9 @@ TEST_F(CookiesTreeModelTest, Remove) {
EXPECT_EQ("", GetDisplayedSessionStorages(cookies_model.get()));
EXPECT_EQ("", GetDisplayedFileSystems(cookies_model.get()));
EXPECT_EQ("", GetDisplayedIndexedDBs(cookies_model.get()));
- EXPECT_EQ(10, cookies_model->GetRoot()->GetTotalNodeCount());
+ EXPECT_EQ(11, cookies_model->GetRoot()->GetTotalNodeCount());
}
- DeleteStoredObjects(cookies_model->GetRoot()->GetChild(2));
+ DeleteStoredObjects(cookies_model->GetRoot()->GetChild(0)->GetChild(2));
{
SCOPED_TRACE("`foo3` removed.");
EXPECT_STREQ("A,B", GetDisplayedCookies(cookies_model.get()).c_str());
@@ -597,9 +605,9 @@ TEST_F(CookiesTreeModelTest, Remove) {
EXPECT_EQ("", GetDisplayedSessionStorages(cookies_model.get()));
EXPECT_EQ("", GetDisplayedFileSystems(cookies_model.get()));
EXPECT_EQ("", GetDisplayedIndexedDBs(cookies_model.get()));
- EXPECT_EQ(7, cookies_model->GetRoot()->GetTotalNodeCount());
+ EXPECT_EQ(8, cookies_model->GetRoot()->GetTotalNodeCount());
}
- DeleteStoredObjects(cookies_model->GetRoot()->GetChild(1));
+ DeleteStoredObjects(cookies_model->GetRoot()->GetChild(0)->GetChild(1));
{
SCOPED_TRACE("`foo2` removed.");
EXPECT_STREQ("A", GetDisplayedCookies(cookies_model.get()).c_str());
@@ -608,9 +616,9 @@ TEST_F(CookiesTreeModelTest, Remove) {
EXPECT_EQ("", GetDisplayedSessionStorages(cookies_model.get()));
EXPECT_EQ("", GetDisplayedFileSystems(cookies_model.get()));
EXPECT_EQ("", GetDisplayedIndexedDBs(cookies_model.get()));
- EXPECT_EQ(4, cookies_model->GetRoot()->GetTotalNodeCount());
+ EXPECT_EQ(5, cookies_model->GetRoot()->GetTotalNodeCount());
}
- DeleteStoredObjects(cookies_model->GetRoot()->GetChild(0));
+ DeleteStoredObjects(cookies_model->GetRoot()->GetChild(0)->GetChild(0));
{
SCOPED_TRACE("`foo1` removed.");
EXPECT_STREQ("", GetDisplayedCookies(cookies_model.get()).c_str());
@@ -619,7 +627,7 @@ TEST_F(CookiesTreeModelTest, Remove) {
EXPECT_EQ("", GetDisplayedSessionStorages(cookies_model.get()));
EXPECT_EQ("", GetDisplayedFileSystems(cookies_model.get()));
EXPECT_EQ("", GetDisplayedIndexedDBs(cookies_model.get()));
- EXPECT_EQ(1, cookies_model->GetRoot()->GetTotalNodeCount());
+ EXPECT_EQ(2, cookies_model->GetRoot()->GetTotalNodeCount());
}
}
@@ -627,7 +635,8 @@ TEST_F(CookiesTreeModelTest, RemoveCookiesNode) {
scoped_ptr<CookiesTreeModel> cookies_model(
CreateCookiesTreeModelWithInitialSample());
- DeleteStoredObjects(cookies_model->GetRoot()->GetChild(0)->GetChild(0));
+ DeleteStoredObjects(
+ cookies_model->GetRoot()->GetChild(0)->GetChild(0)->GetChild(0));
{
SCOPED_TRACE("First origin removed");
EXPECT_STREQ("B,C", GetDisplayedCookies(cookies_model.get()).c_str());
@@ -646,7 +655,7 @@ TEST_F(CookiesTreeModelTest, RemoveCookiesNode) {
// quotahost2 -> quotahost1,
// sbc1 -> sbcerts -> sbc1,
// sbc2 -> sbcerts -> sbc2.
- EXPECT_EQ(49, cookies_model->GetRoot()->GetTotalNodeCount());
+ EXPECT_EQ(50, cookies_model->GetRoot()->GetTotalNodeCount());
EXPECT_EQ("db1,db2", GetDisplayedDatabases(cookies_model.get()));
EXPECT_EQ("http://host1:1/,http://host2:2/",
GetDisplayedLocalStorages(cookies_model.get()));
@@ -660,7 +669,8 @@ TEST_F(CookiesTreeModelTest, RemoveCookiesNode) {
EXPECT_EQ("sbc1,sbc2", GetDisplayedServerBoundCerts(cookies_model.get()));
}
- DeleteStoredObjects(cookies_model->GetRoot()->GetChild(6)->GetChild(0));
+ DeleteStoredObjects(
+ cookies_model->GetRoot()->GetChild(0)->GetChild(6)->GetChild(0));
{
SCOPED_TRACE("First database removed");
EXPECT_STREQ("B,C", GetDisplayedCookies(cookies_model.get()).c_str());
@@ -675,10 +685,11 @@ TEST_F(CookiesTreeModelTest, RemoveCookiesNode) {
GetDisplayedFileSystems(cookies_model.get()));
EXPECT_EQ("quotahost1,quotahost2", GetDisplayedQuotas(cookies_model.get()));
EXPECT_EQ("sbc1,sbc2", GetDisplayedServerBoundCerts(cookies_model.get()));
- EXPECT_EQ(47, cookies_model->GetRoot()->GetTotalNodeCount());
+ EXPECT_EQ(48, cookies_model->GetRoot()->GetTotalNodeCount());
}
- DeleteStoredObjects(cookies_model->GetRoot()->GetChild(8)->GetChild(0));
+ DeleteStoredObjects(
+ cookies_model->GetRoot()->GetChild(0)->GetChild(8)->GetChild(0));
{
SCOPED_TRACE("First origin removed");
EXPECT_STREQ("B,C", GetDisplayedCookies(cookies_model.get()).c_str());
@@ -693,7 +704,7 @@ TEST_F(CookiesTreeModelTest, RemoveCookiesNode) {
GetDisplayedFileSystems(cookies_model.get()));
EXPECT_EQ("quotahost1,quotahost2", GetDisplayedQuotas(cookies_model.get()));
EXPECT_EQ("sbc1,sbc2", GetDisplayedServerBoundCerts(cookies_model.get()));
- EXPECT_EQ(45, cookies_model->GetRoot()->GetTotalNodeCount());
+ EXPECT_EQ(46, cookies_model->GetRoot()->GetTotalNodeCount());
}
}
@@ -701,7 +712,8 @@ TEST_F(CookiesTreeModelTest, RemoveCookieNode) {
scoped_ptr<CookiesTreeModel> cookies_model(
CreateCookiesTreeModelWithInitialSample());
- DeleteStoredObjects(cookies_model->GetRoot()->GetChild(1)->GetChild(0));
+ DeleteStoredObjects(
+ cookies_model->GetRoot()->GetChild(0)->GetChild(1)->GetChild(0));
{
SCOPED_TRACE("Second origin COOKIES node removed");
EXPECT_STREQ("A,C", GetDisplayedCookies(cookies_model.get()).c_str());
@@ -731,10 +743,11 @@ TEST_F(CookiesTreeModelTest, RemoveCookieNode) {
// idbhost2 -> sessionstorage -> http://idbhost2:2/,
// quotahost1 -> quotahost1,
// quotahost2 -> quotahost2.
- EXPECT_EQ(49, cookies_model->GetRoot()->GetTotalNodeCount());
+ EXPECT_EQ(50, cookies_model->GetRoot()->GetTotalNodeCount());
}
- DeleteStoredObjects(cookies_model->GetRoot()->GetChild(6)->GetChild(0));
+ DeleteStoredObjects(
+ cookies_model->GetRoot()->GetChild(0)->GetChild(6)->GetChild(0));
{
SCOPED_TRACE("First database removed");
EXPECT_STREQ("A,C", GetDisplayedCookies(cookies_model.get()).c_str());
@@ -749,10 +762,11 @@ TEST_F(CookiesTreeModelTest, RemoveCookieNode) {
GetDisplayedFileSystems(cookies_model.get()));
EXPECT_EQ("quotahost1,quotahost2", GetDisplayedQuotas(cookies_model.get()));
EXPECT_EQ("sbc1,sbc2", GetDisplayedServerBoundCerts(cookies_model.get()));
- EXPECT_EQ(47, cookies_model->GetRoot()->GetTotalNodeCount());
+ EXPECT_EQ(48, cookies_model->GetRoot()->GetTotalNodeCount());
}
- DeleteStoredObjects(cookies_model->GetRoot()->GetChild(8)->GetChild(0));
+ DeleteStoredObjects(
+ cookies_model->GetRoot()->GetChild(0)->GetChild(8)->GetChild(0));
{
SCOPED_TRACE("First origin removed");
EXPECT_STREQ("A,C", GetDisplayedCookies(cookies_model.get()).c_str());
@@ -767,21 +781,27 @@ TEST_F(CookiesTreeModelTest, RemoveCookieNode) {
GetDisplayedFileSystems(cookies_model.get()));
EXPECT_EQ("quotahost1,quotahost2", GetDisplayedQuotas(cookies_model.get()));
EXPECT_EQ("sbc1,sbc2", GetDisplayedServerBoundCerts(cookies_model.get()));
- EXPECT_EQ(45, cookies_model->GetRoot()->GetTotalNodeCount());
+ EXPECT_EQ(46, cookies_model->GetRoot()->GetTotalNodeCount());
}
}
TEST_F(CookiesTreeModelTest, RemoveSingleCookieNode) {
- CookiesTreeModel cookies_model(mock_browsing_data_cookie_helper_,
- mock_browsing_data_database_helper_,
- mock_browsing_data_local_storage_helper_,
- mock_browsing_data_session_storage_helper_,
- mock_browsing_data_appcache_helper_,
- mock_browsing_data_indexed_db_helper_,
- mock_browsing_data_file_system_helper_,
- mock_browsing_data_quota_helper_,
- mock_browsing_data_server_bound_cert_helper_,
- false);
+ string16 name = ASCIIToUTF16("Drive-By-Web");
+ string16 id = ASCIIToUTF16("");
+ LocalDataContainer container(name, id,
+ mock_browsing_data_cookie_helper_,
+ mock_browsing_data_database_helper_,
+ mock_browsing_data_local_storage_helper_,
+ mock_browsing_data_session_storage_helper_,
+ mock_browsing_data_appcache_helper_,
+ mock_browsing_data_indexed_db_helper_,
+ mock_browsing_data_file_system_helper_,
+ mock_browsing_data_quota_helper_,
+ mock_browsing_data_server_bound_cert_helper_,
+ false);
+ ContainerMap container_map;
+ container_map[id] = &container;
+ CookiesTreeModel cookies_model(container_map);
mock_browsing_data_cookie_helper_->
AddCookieSamples(GURL("http://foo1"), "A=1");
mock_browsing_data_cookie_helper_->
@@ -821,7 +841,7 @@ TEST_F(CookiesTreeModelTest, RemoveSingleCookieNode) {
// idbhost2 -> sessionstorage -> http://idbhost2:2/,
// quotahost1 -> quotahost1,
// quotahost2 -> quotahost2.
- EXPECT_EQ(46, cookies_model.GetRoot()->GetTotalNodeCount());
+ EXPECT_EQ(47, 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/",
@@ -834,7 +854,7 @@ TEST_F(CookiesTreeModelTest, RemoveSingleCookieNode) {
GetDisplayedFileSystems(&cookies_model));
EXPECT_EQ("quotahost1,quotahost2", GetDisplayedQuotas(&cookies_model));
}
- DeleteStoredObjects(cookies_model.GetRoot()->GetChild(2));
+ DeleteStoredObjects(cookies_model.GetRoot()->GetChild(0)->GetChild(2));
{
SCOPED_TRACE("Third origin removed");
EXPECT_STREQ("A,B", GetDisplayedCookies(&cookies_model).c_str());
@@ -848,21 +868,28 @@ TEST_F(CookiesTreeModelTest, RemoveSingleCookieNode) {
EXPECT_EQ("http://fshost1:1/,http://fshost2:2/,http://fshost3:3/",
GetDisplayedFileSystems(&cookies_model));
EXPECT_EQ("quotahost1,quotahost2", GetDisplayedQuotas(&cookies_model));
- EXPECT_EQ(42, cookies_model.GetRoot()->GetTotalNodeCount());
+ EXPECT_EQ(43, cookies_model.GetRoot()->GetTotalNodeCount());
}
}
TEST_F(CookiesTreeModelTest, RemoveSingleCookieNodeOf3) {
- CookiesTreeModel cookies_model(mock_browsing_data_cookie_helper_,
- mock_browsing_data_database_helper_,
- mock_browsing_data_local_storage_helper_,
- mock_browsing_data_session_storage_helper_,
- mock_browsing_data_appcache_helper_,
- mock_browsing_data_indexed_db_helper_,
- mock_browsing_data_file_system_helper_,
- mock_browsing_data_quota_helper_,
- mock_browsing_data_server_bound_cert_helper_,
- false);
+ string16 name = ASCIIToUTF16("Drive-By-Web");
+ string16 id = ASCIIToUTF16("");
+ LocalDataContainer container(name, id,
+ mock_browsing_data_cookie_helper_,
+ mock_browsing_data_database_helper_,
+ mock_browsing_data_local_storage_helper_,
+ mock_browsing_data_session_storage_helper_,
+ mock_browsing_data_appcache_helper_,
+ mock_browsing_data_indexed_db_helper_,
+ mock_browsing_data_file_system_helper_,
+ mock_browsing_data_quota_helper_,
+ mock_browsing_data_server_bound_cert_helper_,
+ false);
+ ContainerMap container_map;
+ container_map[id] = &container;
+ CookiesTreeModel cookies_model(container_map);
+
mock_browsing_data_cookie_helper_->
AddCookieSamples(GURL("http://foo1"), "A=1");
mock_browsing_data_cookie_helper_->
@@ -905,7 +932,7 @@ TEST_F(CookiesTreeModelTest, RemoveSingleCookieNodeOf3) {
// idbhost2 -> sessionstorage -> http://idbhost2:2/,
// quotahost1 -> quotahost1,
// quotahost2 -> quotahost2.
- EXPECT_EQ(47, cookies_model.GetRoot()->GetTotalNodeCount());
+ EXPECT_EQ(48, 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/",
@@ -918,12 +945,12 @@ TEST_F(CookiesTreeModelTest, RemoveSingleCookieNodeOf3) {
GetDisplayedFileSystems(&cookies_model));
EXPECT_EQ("quotahost1,quotahost2", GetDisplayedQuotas(&cookies_model));
}
- DeleteStoredObjects(cookies_model.GetRoot()->GetChild(2)->GetChild(0)->
- GetChild(1));
+ DeleteStoredObjects(cookies_model.GetRoot()->GetChild(0)->GetChild(2)->
+ GetChild(0)->GetChild(1));
{
SCOPED_TRACE("Middle cookie in third origin removed");
EXPECT_STREQ("A,B,C,E", GetDisplayedCookies(&cookies_model).c_str());
- EXPECT_EQ(46, cookies_model.GetRoot()->GetTotalNodeCount());
+ EXPECT_EQ(47, cookies_model.GetRoot()->GetTotalNodeCount());
EXPECT_EQ("db1,db2", GetDisplayedDatabases(&cookies_model));
EXPECT_EQ("http://host1:1/,http://host2:2/",
GetDisplayedLocalStorages(&cookies_model));
@@ -938,16 +965,22 @@ TEST_F(CookiesTreeModelTest, RemoveSingleCookieNodeOf3) {
}
TEST_F(CookiesTreeModelTest, RemoveSecondOrigin) {
- CookiesTreeModel cookies_model(mock_browsing_data_cookie_helper_,
- mock_browsing_data_database_helper_,
- mock_browsing_data_local_storage_helper_,
- mock_browsing_data_session_storage_helper_,
- mock_browsing_data_appcache_helper_,
- mock_browsing_data_indexed_db_helper_,
- mock_browsing_data_file_system_helper_,
- mock_browsing_data_quota_helper_,
- mock_browsing_data_server_bound_cert_helper_,
- false);
+ string16 name = ASCIIToUTF16("Drive-By-Web");
+ string16 id = ASCIIToUTF16("");
+ LocalDataContainer container(name, id,
+ mock_browsing_data_cookie_helper_,
+ mock_browsing_data_database_helper_,
+ mock_browsing_data_local_storage_helper_,
+ mock_browsing_data_session_storage_helper_,
+ mock_browsing_data_appcache_helper_,
+ mock_browsing_data_indexed_db_helper_,
+ mock_browsing_data_file_system_helper_,
+ mock_browsing_data_quota_helper_,
+ mock_browsing_data_server_bound_cert_helper_,
+ false);
+ ContainerMap container_map;
+ container_map[id] = &container;
+ CookiesTreeModel cookies_model(container_map);
mock_browsing_data_cookie_helper_->
AddCookieSamples(GURL("http://foo1"), "A=1");
mock_browsing_data_cookie_helper_->
@@ -964,29 +997,35 @@ TEST_F(CookiesTreeModelTest, RemoveSecondOrigin) {
SCOPED_TRACE("Initial State 5 cookies");
// 11 because there's the root, then foo1 -> cookies -> a,
// foo2 -> cookies -> b, foo3 -> cookies -> c,d,e
- EXPECT_EQ(12, cookies_model.GetRoot()->GetTotalNodeCount());
+ EXPECT_EQ(13, cookies_model.GetRoot()->GetTotalNodeCount());
EXPECT_STREQ("A,B,C,D,E", GetDisplayedCookies(&cookies_model).c_str());
}
- DeleteStoredObjects(cookies_model.GetRoot()->GetChild(1));
+ DeleteStoredObjects(cookies_model.GetRoot()->GetChild(0)->GetChild(1));
{
SCOPED_TRACE("Second origin removed");
EXPECT_STREQ("A,C,D,E", GetDisplayedCookies(&cookies_model).c_str());
// Left with root -> foo1 -> cookies -> a, foo3 -> cookies -> c,d,e
- EXPECT_EQ(9, cookies_model.GetRoot()->GetTotalNodeCount());
+ EXPECT_EQ(10, cookies_model.GetRoot()->GetTotalNodeCount());
}
}
TEST_F(CookiesTreeModelTest, OriginOrdering) {
- CookiesTreeModel cookies_model(mock_browsing_data_cookie_helper_,
- mock_browsing_data_database_helper_,
- mock_browsing_data_local_storage_helper_,
- mock_browsing_data_session_storage_helper_,
- mock_browsing_data_appcache_helper_,
- mock_browsing_data_indexed_db_helper_,
- mock_browsing_data_file_system_helper_,
- mock_browsing_data_quota_helper_,
- mock_browsing_data_server_bound_cert_helper_,
- false);
+ string16 name = ASCIIToUTF16("Drive-By-Web");
+ string16 id = ASCIIToUTF16("");
+ LocalDataContainer container(name, id,
+ mock_browsing_data_cookie_helper_,
+ mock_browsing_data_database_helper_,
+ mock_browsing_data_local_storage_helper_,
+ mock_browsing_data_session_storage_helper_,
+ mock_browsing_data_appcache_helper_,
+ mock_browsing_data_indexed_db_helper_,
+ mock_browsing_data_file_system_helper_,
+ mock_browsing_data_quota_helper_,
+ mock_browsing_data_server_bound_cert_helper_,
+ false);
+ ContainerMap container_map;
+ container_map[id] = &container;
+ CookiesTreeModel cookies_model(container_map);
mock_browsing_data_cookie_helper_->
AddCookieSamples(GURL("http://a.foo2.com"), "A=1");
mock_browsing_data_cookie_helper_->
@@ -1008,11 +1047,12 @@ TEST_F(CookiesTreeModelTest, OriginOrdering) {
{
SCOPED_TRACE("Initial State 8 cookies");
- EXPECT_EQ(23, cookies_model.GetRoot()->GetTotalNodeCount());
+ EXPECT_EQ(24, cookies_model.GetRoot()->GetTotalNodeCount());
EXPECT_STREQ("F,E,C,B,A,G,D,H",
GetDisplayedCookies(&cookies_model).c_str());
}
- DeleteStoredObjects(cookies_model.GetRoot()->GetChild(1)); // Delete "E"
+ // Delete "E"
+ DeleteStoredObjects(cookies_model.GetRoot()->GetChild(0)->GetChild(1));
{
EXPECT_STREQ("F,C,B,A,G,D,H", GetDisplayedCookies(&cookies_model).c_str());
}
@@ -1020,19 +1060,27 @@ TEST_F(CookiesTreeModelTest, OriginOrdering) {
TEST_F(CookiesTreeModelTest, ContentSettings) {
GURL host("http://example.com/");
- CookiesTreeModel cookies_model(mock_browsing_data_cookie_helper_,
- mock_browsing_data_database_helper_,
- mock_browsing_data_local_storage_helper_,
- mock_browsing_data_session_storage_helper_,
- mock_browsing_data_appcache_helper_,
- mock_browsing_data_indexed_db_helper_,
- mock_browsing_data_file_system_helper_,
- mock_browsing_data_quota_helper_,
- mock_browsing_data_server_bound_cert_helper_,
- false);
+ string16 name = ASCIIToUTF16("Drive-By-Web");
+ string16 id = ASCIIToUTF16("");
+ LocalDataContainer container(name, id,
+ mock_browsing_data_cookie_helper_,
+ mock_browsing_data_database_helper_,
+ mock_browsing_data_local_storage_helper_,
+ mock_browsing_data_session_storage_helper_,
+ mock_browsing_data_appcache_helper_,
+ mock_browsing_data_indexed_db_helper_,
+ mock_browsing_data_file_system_helper_,
+ mock_browsing_data_quota_helper_,
+ mock_browsing_data_server_bound_cert_helper_,
+ false);
+ ContainerMap container_map;
+ container_map[id] = &container;
+ CookiesTreeModel cookies_model(container_map);
+
mock_browsing_data_cookie_helper_->AddCookieSamples(host, "A=1");
mock_browsing_data_cookie_helper_->Notify();
+ /*
TestingProfile profile;
HostContentSettingsMap* content_settings =
profile.GetHostContentSettingsMap();
@@ -1065,6 +1113,7 @@ TEST_F(CookiesTreeModelTest, ContentSettings) {
cookie_settings, CONTENT_SETTING_SESSION_ONLY);
EXPECT_TRUE(cookie_settings->IsReadingCookieAllowed(host, host));
EXPECT_TRUE(cookie_settings->IsCookieSessionOnly(host));
+ */
}
TEST_F(CookiesTreeModelTest, FileSystemFilter) {
« chrome/browser/cookies_tree_model.cc ('K') | « chrome/browser/cookies_tree_model.cc ('k') | chrome/browser/resources/options2/cookies_list.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698