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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/cookies_tree_model_unittest.cc

Issue 7491085: Revert 95607 - Adding usage entry to chrome://settings/cookies. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 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/cookies_tree_model.cc ('k') | chrome/browser/mock_browsing_data_quota_helper.h » ('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
===================================================================
--- chrome/browser/cookies_tree_model_unittest.cc (revision 95777)
+++ chrome/browser/cookies_tree_model_unittest.cc (working copy)
@@ -12,7 +12,6 @@
#include "chrome/browser/mock_browsing_data_database_helper.h"
#include "chrome/browser/mock_browsing_data_file_system_helper.h"
#include "chrome/browser/mock_browsing_data_indexed_db_helper.h"
-#include "chrome/browser/mock_browsing_data_quota_helper.h"
#include "chrome/browser/mock_browsing_data_local_storage_helper.h"
#include "chrome/test/base/testing_profile.h"
#include "chrome/test/testing_browser_process_test.h"
@@ -52,8 +51,6 @@
new MockBrowsingDataIndexedDBHelper(profile_.get());
mock_browsing_data_file_system_helper_ =
new MockBrowsingDataFileSystemHelper(profile_.get());
- mock_browsing_data_quota_helper_ =
- new MockBrowsingDataQuotaHelper(profile_.get());
}
CookiesTreeModel* CreateCookiesTreeModelWithInitialSample() {
@@ -68,7 +65,6 @@
mock_browsing_data_appcache_helper_,
mock_browsing_data_indexed_db_helper_,
mock_browsing_data_file_system_helper_,
- mock_browsing_data_quota_helper_,
false);
mock_browsing_data_database_helper_->AddDatabaseSamples();
mock_browsing_data_database_helper_->Notify();
@@ -80,13 +76,10 @@
mock_browsing_data_indexed_db_helper_->Notify();
mock_browsing_data_file_system_helper_->AddFileSystemSamples();
mock_browsing_data_file_system_helper_->Notify();
- mock_browsing_data_quota_helper_->AddQuotaSamples();
- mock_browsing_data_quota_helper_->Notify();
{
SCOPED_TRACE("Initial State 3 cookies, 2 databases, 2 local storages, "
- "2 session storages, 2 indexed DBs, 3 filesystems, "
- "2 quotas");
- // 45 because there's the root, then foo1 -> cookies -> a,
+ "2 session storages, 2 indexed DBs, 3 filesystems");
+ // 41 because there's the root, then foo1 -> cookies -> a,
// foo2 -> cookies -> b, foo3 -> cookies -> c,
// dbhost1 -> database -> db1, dbhost2 -> database -> db2,
// fshost1 -> filesystem -> http://fshost1:1/,
@@ -97,10 +90,8 @@
// host1 -> sessionstorage -> http://host1:1/,
// host2 -> sessionstorage -> http://host2:2/,
// idbhost1 -> indexeddb -> http://idbhost1:1/,
- // idbhost2 -> indexeddb -> http://idbhost2:2/,
- // quotahost1 -> quotahost1,
- // quotahost2 -> quotahost2.
- EXPECT_EQ(45, cookies_model->GetRoot()->GetTotalNodeCount());
+ // idbhost2 -> indexeddb -> http://idbhost2:2/.
+ EXPECT_EQ(41, cookies_model->GetRoot()->GetTotalNodeCount());
EXPECT_EQ("db1,db2", GetDisplayedDatabases(cookies_model));
EXPECT_EQ("http://host1:1/,http://host2:2/",
GetDisplayedLocalStorages(cookies_model));
@@ -110,8 +101,6 @@
GetDisplayedIndexedDBs(cookies_model));
EXPECT_EQ("http://fshost1:1/,http://fshost2:2/,http://fshost3:3/",
GetDisplayedFileSystems(cookies_model));
- EXPECT_EQ("quotahost1,quotahost2",
- GetDisplayedQuotas(cookies_model));
}
return cookies_model;
}
@@ -158,8 +147,6 @@
case CookieTreeNode::DetailedInfo::TYPE_FILE_SYSTEM:
return node->GetDetailedInfo().file_system_info->origin.spec() +
",";
- case CookieTreeNode::DetailedInfo::TYPE_QUOTA:
- return node->GetDetailedInfo().quota_info->host + ",";
default:
return "";
}
@@ -198,11 +185,6 @@
node, CookieTreeNode::DetailedInfo::TYPE_FILE_SYSTEM);
}
- std::string GetFileQuotaOfChildren(const CookieTreeNode* node) {
- return GetNodesOfChildren(
- node, CookieTreeNode::DetailedInfo::TYPE_QUOTA);
- }
-
// Get the nodes names displayed in the view (if we had one) in the order
// they are displayed, as a comma seperated string.
// Ex: EXPECT_STREQ("X,Y", GetDisplayedNodes(cookies_view, type).c_str());
@@ -251,11 +233,6 @@
CookieTreeNode::DetailedInfo::TYPE_FILE_SYSTEM);
}
- std::string GetDisplayedQuotas(CookiesTreeModel* cookies_model) {
- return GetDisplayedNodes(cookies_model,
- CookieTreeNode::DetailedInfo::TYPE_QUOTA);
- }
-
// Do not call on the root.
void DeleteStoredObjects(CookieTreeNode* node) {
node->DeleteStoredObjects();
@@ -282,8 +259,6 @@
mock_browsing_data_indexed_db_helper_;
scoped_refptr<MockBrowsingDataFileSystemHelper>
mock_browsing_data_file_system_helper_;
- scoped_refptr<MockBrowsingDataQuotaHelper>
- mock_browsing_data_quota_helper_;
};
TEST_F(CookiesTreeModelTest, RemoveAll) {
@@ -306,8 +281,6 @@
GetDisplayedIndexedDBs(cookies_model.get()));
EXPECT_EQ("http://fshost1:1/,http://fshost2:2/,http://fshost3:3/",
GetDisplayedFileSystems(cookies_model.get()));
- EXPECT_EQ("quotahost1,quotahost2",
- GetDisplayedQuotas(cookies_model.get()));
}
mock_browsing_data_database_helper_->Reset();
@@ -352,46 +325,10 @@
// 9. `host2`
// 10. `idbhost1`
// 11. `idbhost2`
- // 12. `quotahost1`
- // 13. `quotahost2`
//
// Here, we'll remove them one by one, starting from the end, and
// check that the state makes sense.
- DeleteStoredObjects(cookies_model->GetRoot()->GetChild(13));
- {
- SCOPED_TRACE("`quotahost2` removed.");
- EXPECT_STREQ("A,B,C", GetMonsterCookies(monster).c_str());
- EXPECT_STREQ("A,B,C", GetDisplayedCookies(cookies_model.get()).c_str());
- EXPECT_EQ("db1,db2", GetDisplayedDatabases(cookies_model.get()));
- EXPECT_EQ("http://host1:1/,http://host2:2/",
- GetDisplayedLocalStorages(cookies_model.get()));
- EXPECT_EQ("http://host1:1/,http://host2:2/",
- GetDisplayedSessionStorages(cookies_model.get()));
- EXPECT_EQ("http://fshost1:1/,http://fshost2:2/,http://fshost3:3/",
- GetDisplayedFileSystems(cookies_model.get()));
- EXPECT_EQ("http://idbhost1:1/,http://idbhost2:2/",
- GetDisplayedIndexedDBs(cookies_model.get()));
- EXPECT_EQ("quotahost1",
- GetDisplayedQuotas(cookies_model.get()));
- EXPECT_EQ(43, cookies_model->GetRoot()->GetTotalNodeCount());
- }
- DeleteStoredObjects(cookies_model->GetRoot()->GetChild(12));
- {
- SCOPED_TRACE("`quotahost1` removed.");
- EXPECT_STREQ("A,B,C", GetMonsterCookies(monster).c_str());
- EXPECT_STREQ("A,B,C", GetDisplayedCookies(cookies_model.get()).c_str());
- EXPECT_EQ("db1,db2", GetDisplayedDatabases(cookies_model.get()));
- EXPECT_EQ("http://host1:1/,http://host2:2/",
- GetDisplayedLocalStorages(cookies_model.get()));
- EXPECT_EQ("http://host1:1/,http://host2:2/",
- GetDisplayedSessionStorages(cookies_model.get()));
- EXPECT_EQ("http://fshost1:1/,http://fshost2:2/,http://fshost3:3/",
- GetDisplayedFileSystems(cookies_model.get()));
- EXPECT_EQ("http://idbhost1:1/,http://idbhost2:2/",
- GetDisplayedIndexedDBs(cookies_model.get()));
- EXPECT_EQ(41, cookies_model->GetRoot()->GetTotalNodeCount());
- }
DeleteStoredObjects(cookies_model->GetRoot()->GetChild(11));
{
SCOPED_TRACE("`idbhost2` removed.");
@@ -563,7 +500,7 @@
SCOPED_TRACE("First origin removed");
EXPECT_STREQ("B,C", GetMonsterCookies(monster).c_str());
EXPECT_STREQ("B,C", GetDisplayedCookies(cookies_model.get()).c_str());
- // 43 because in this case, the origin remains, although the COOKIES
+ // 39 because in this case, the origin remains, although the COOKIES
// node beneath it has been deleted. So, we have
// root -> foo1 -> cookies -> a, foo2, foo3 -> cookies -> c
// dbhost1 -> database -> db1, dbhost2 -> database -> db2,
@@ -573,10 +510,8 @@
// host1 -> localstorage -> http://host1:1/,
// host2 -> localstorage -> http://host2:2/,
// idbhost1 -> sessionstorage -> http://idbhost1:1/,
- // idbhost2 -> sessionstorage -> http://idbhost2:2/,
- // quotahost1 -> quotahost1,
- // quotahost2 -> quotahost1.
- EXPECT_EQ(43, cookies_model->GetRoot()->GetTotalNodeCount());
+ // idbhost2 -> sessionstorage -> http://idbhost2:2/.
+ EXPECT_EQ(39, cookies_model->GetRoot()->GetTotalNodeCount());
EXPECT_EQ("db1,db2", GetDisplayedDatabases(cookies_model.get()));
EXPECT_EQ("http://host1:1/,http://host2:2/",
GetDisplayedLocalStorages(cookies_model.get()));
@@ -586,7 +521,6 @@
GetDisplayedIndexedDBs(cookies_model.get()));
EXPECT_EQ("http://fshost1:1/,http://fshost2:2/,http://fshost3:3/",
GetDisplayedFileSystems(cookies_model.get()));
- EXPECT_EQ("quotahost1,quotahost2", GetDisplayedQuotas(cookies_model.get()));
}
DeleteStoredObjects(cookies_model->GetRoot()->GetChild(6)->GetChild(0));
@@ -603,8 +537,7 @@
GetDisplayedIndexedDBs(cookies_model.get()));
EXPECT_EQ("http://fshost1:1/,http://fshost2:2/,http://fshost3:3/",
GetDisplayedFileSystems(cookies_model.get()));
- EXPECT_EQ("quotahost1,quotahost2", GetDisplayedQuotas(cookies_model.get()));
- EXPECT_EQ(41, cookies_model->GetRoot()->GetTotalNodeCount());
+ EXPECT_EQ(37, cookies_model->GetRoot()->GetTotalNodeCount());
}
DeleteStoredObjects(cookies_model->GetRoot()->GetChild(8)->GetChild(0));
@@ -621,8 +554,7 @@
GetDisplayedIndexedDBs(cookies_model.get()));
EXPECT_EQ("http://fshost1:1/,http://fshost2:2/,http://fshost3:3/",
GetDisplayedFileSystems(cookies_model.get()));
- EXPECT_EQ("quotahost1,quotahost2", GetDisplayedQuotas(cookies_model.get()));
- EXPECT_EQ(39, cookies_model->GetRoot()->GetTotalNodeCount());
+ EXPECT_EQ(35, cookies_model->GetRoot()->GetTotalNodeCount());
}
}
@@ -645,8 +577,7 @@
GetDisplayedIndexedDBs(cookies_model.get()));
EXPECT_EQ("http://fshost1:1/,http://fshost2:2/,http://fshost3:3/",
GetDisplayedFileSystems(cookies_model.get()));
- EXPECT_EQ("quotahost1,quotahost2", GetDisplayedQuotas(cookies_model.get()));
- // 43 because in this case, the origin remains, although the COOKIES
+ // 39 because in this case, the origin remains, although the COOKIES
// node beneath it has been deleted. So, we have
// root -> foo1 -> cookies -> a, foo2, foo3 -> cookies -> c
// dbhost1 -> database -> db1, dbhost2 -> database -> db2,
@@ -658,10 +589,8 @@
// host1 -> sessionstorage -> http://host1:1/,
// host2 -> sessionstorage -> http://host2:2/,
// idbhost1 -> sessionstorage -> http://idbhost1:1/,
- // idbhost2 -> sessionstorage -> http://idbhost2:2/,
- // quotahost1 -> quotahost1,
- // quotahost2 -> quotahost2.
- EXPECT_EQ(43, cookies_model->GetRoot()->GetTotalNodeCount());
+ // idbhost2 -> sessionstorage -> http://idbhost2:2/.
+ EXPECT_EQ(39, cookies_model->GetRoot()->GetTotalNodeCount());
}
DeleteStoredObjects(cookies_model->GetRoot()->GetChild(6)->GetChild(0));
@@ -678,8 +607,7 @@
GetDisplayedIndexedDBs(cookies_model.get()));
EXPECT_EQ("http://fshost1:1/,http://fshost2:2/,http://fshost3:3/",
GetDisplayedFileSystems(cookies_model.get()));
- EXPECT_EQ("quotahost1,quotahost2", GetDisplayedQuotas(cookies_model.get()));
- EXPECT_EQ(41, cookies_model->GetRoot()->GetTotalNodeCount());
+ EXPECT_EQ(37, cookies_model->GetRoot()->GetTotalNodeCount());
}
DeleteStoredObjects(cookies_model->GetRoot()->GetChild(8)->GetChild(0));
@@ -696,8 +624,7 @@
GetDisplayedIndexedDBs(cookies_model.get()));
EXPECT_EQ("http://fshost1:1/,http://fshost2:2/,http://fshost3:3/",
GetDisplayedFileSystems(cookies_model.get()));
- EXPECT_EQ("quotahost1,quotahost2", GetDisplayedQuotas(cookies_model.get()));
- EXPECT_EQ(39, cookies_model->GetRoot()->GetTotalNodeCount());
+ EXPECT_EQ(35, cookies_model->GetRoot()->GetTotalNodeCount());
}
}
@@ -714,7 +641,6 @@
mock_browsing_data_appcache_helper_,
mock_browsing_data_indexed_db_helper_,
mock_browsing_data_file_system_helper_,
- mock_browsing_data_quota_helper_,
false);
mock_browsing_data_database_helper_->AddDatabaseSamples();
mock_browsing_data_database_helper_->Notify();
@@ -726,13 +652,10 @@
mock_browsing_data_indexed_db_helper_->Notify();
mock_browsing_data_file_system_helper_->AddFileSystemSamples();
mock_browsing_data_file_system_helper_->Notify();
- mock_browsing_data_quota_helper_->AddQuotaSamples();
- mock_browsing_data_quota_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 session storages, 2 indexed DBs, 3 file systems");
// 42 because there's the root, then foo1 -> cookies -> a,
// foo2 -> cookies -> b, foo3 -> cookies -> c,d
// dbhost1 -> database -> db1, dbhost2 -> database -> db2,
@@ -743,10 +666,8 @@
// host1 -> sessionstorage -> http://host1:1/,
// host2 -> sessionstorage -> http://host2:2/,
// idbhost1 -> sessionstorage -> http://idbhost1:1/,
- // idbhost2 -> sessionstorage -> http://idbhost2:2/,
- // quotahost1 -> quotahost1,
- // quotahost2 -> quotahost2.
- EXPECT_EQ(46, cookies_model.GetRoot()->GetTotalNodeCount());
+ // idbhost2 -> sessionstorage -> http://idbhost2:2/.
+ EXPECT_EQ(42, cookies_model.GetRoot()->GetTotalNodeCount());
EXPECT_STREQ("A,B,C,D", GetMonsterCookies(monster).c_str());
EXPECT_STREQ("A,B,C,D", GetDisplayedCookies(&cookies_model).c_str());
EXPECT_EQ("db1,db2", GetDisplayedDatabases(&cookies_model));
@@ -758,7 +679,6 @@
GetDisplayedIndexedDBs(&cookies_model));
EXPECT_EQ("http://fshost1:1/,http://fshost2:2/,http://fshost3:3/",
GetDisplayedFileSystems(&cookies_model));
- EXPECT_EQ("quotahost1,quotahost2", GetDisplayedQuotas(&cookies_model));
}
DeleteStoredObjects(cookies_model.GetRoot()->GetChild(2));
{
@@ -774,8 +694,7 @@
GetDisplayedIndexedDBs(&cookies_model));
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(38, cookies_model.GetRoot()->GetTotalNodeCount());
}
}
@@ -793,7 +712,6 @@
mock_browsing_data_appcache_helper_,
mock_browsing_data_indexed_db_helper_,
mock_browsing_data_file_system_helper_,
- mock_browsing_data_quota_helper_,
false);
mock_browsing_data_database_helper_->AddDatabaseSamples();
mock_browsing_data_database_helper_->Notify();
@@ -805,13 +723,10 @@
mock_browsing_data_indexed_db_helper_->Notify();
mock_browsing_data_file_system_helper_->AddFileSystemSamples();
mock_browsing_data_file_system_helper_->Notify();
- mock_browsing_data_quota_helper_->AddQuotaSamples();
- mock_browsing_data_quota_helper_->Notify();
{
SCOPED_TRACE("Initial State 5 cookies, 2 databases, 2 local storages, "
- "2 session storages, 2 indexed DBs, 3 filesystems, "
- "2 quotas.");
+ "2 session storages, 2 indexed DBs");
// 43 because there's the root, then foo1 -> cookies -> a,
// foo2 -> cookies -> b, foo3 -> cookies -> c,d,e
// dbhost1 -> database -> db1, dbhost2 -> database -> db2,
@@ -823,10 +738,8 @@
// host1 -> sessionstorage -> http://host1:1/,
// host2 -> sessionstorage -> http://host2:2/,
// idbhost1 -> sessionstorage -> http://idbhost1:1/,
- // idbhost2 -> sessionstorage -> http://idbhost2:2/,
- // quotahost1 -> quotahost1,
- // quotahost2 -> quotahost2.
- EXPECT_EQ(47, cookies_model.GetRoot()->GetTotalNodeCount());
+ // idbhost2 -> sessionstorage -> http://idbhost2:2/.
+ EXPECT_EQ(43, cookies_model.GetRoot()->GetTotalNodeCount());
EXPECT_STREQ("A,B,C,D,E", GetMonsterCookies(monster).c_str());
EXPECT_STREQ("A,B,C,D,E", GetDisplayedCookies(&cookies_model).c_str());
EXPECT_EQ("db1,db2", GetDisplayedDatabases(&cookies_model));
@@ -838,7 +751,6 @@
GetDisplayedIndexedDBs(&cookies_model));
EXPECT_EQ("http://fshost1:1/,http://fshost2:2/,http://fshost3:3/",
GetDisplayedFileSystems(&cookies_model));
- EXPECT_EQ("quotahost1,quotahost2", GetDisplayedQuotas(&cookies_model));
}
DeleteStoredObjects(cookies_model.GetRoot()->GetChild(2)->GetChild(0)->
GetChild(1));
@@ -846,7 +758,7 @@
SCOPED_TRACE("Middle cookie in third origin removed");
EXPECT_STREQ("A,B,C,E", GetMonsterCookies(monster).c_str());
EXPECT_STREQ("A,B,C,E", GetDisplayedCookies(&cookies_model).c_str());
- EXPECT_EQ(46, cookies_model.GetRoot()->GetTotalNodeCount());
+ EXPECT_EQ(42, cookies_model.GetRoot()->GetTotalNodeCount());
EXPECT_EQ("db1,db2", GetDisplayedDatabases(&cookies_model));
EXPECT_EQ("http://host1:1/,http://host2:2/",
GetDisplayedLocalStorages(&cookies_model));
@@ -856,7 +768,6 @@
GetDisplayedIndexedDBs(&cookies_model));
EXPECT_EQ("http://fshost1:1/,http://fshost2:2/,http://fshost3:3/",
GetDisplayedFileSystems(&cookies_model));
- EXPECT_EQ("quotahost1,quotahost2", GetDisplayedQuotas(&cookies_model));
}
}
@@ -874,7 +785,6 @@
mock_browsing_data_appcache_helper_,
mock_browsing_data_indexed_db_helper_,
mock_browsing_data_file_system_helper_,
- mock_browsing_data_quota_helper_,
false);
{
SCOPED_TRACE("Initial State 5 cookies");
@@ -913,7 +823,6 @@
new MockBrowsingDataAppCacheHelper(profile_.get()),
new MockBrowsingDataIndexedDBHelper(profile_.get()),
new MockBrowsingDataFileSystemHelper(profile_.get()),
- new MockBrowsingDataQuotaHelper(profile_.get()),
false);
{
@@ -943,7 +852,6 @@
new MockBrowsingDataAppCacheHelper(profile_.get()),
new MockBrowsingDataIndexedDBHelper(profile_.get()),
new MockBrowsingDataFileSystemHelper(profile_.get()),
- new MockBrowsingDataQuotaHelper(profile_.get()),
false);
TestingProfile profile;
« no previous file with comments | « chrome/browser/cookies_tree_model.cc ('k') | chrome/browser/mock_browsing_data_quota_helper.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698