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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/cookies_tree_model_unittest.cc

Issue 7355025: Creat BrowsingDataCookieHelper and CannedBrowsingDataCookieHelper for logging cookies at UI thread. (Closed) Base URL: http://src.chromium.org/svn/trunk/src/
Patch Set: '' Created 9 years, 5 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.h ('K') | « chrome/browser/cookies_tree_model.cc ('k') | chrome/browser/ui/webui/options/cookies_view_handler.cc » ('j') | net/base/cookie_monster.cc » ('J')
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 92558)
+++ chrome/browser/cookies_tree_model_unittest.cc (working copy)
@@ -9,6 +9,7 @@
#include "chrome/browser/content_settings/host_content_settings_map.h"
#include "chrome/browser/content_settings/mock_settings_observer.h"
#include "chrome/browser/mock_browsing_data_appcache_helper.h"
+#include "chrome/browser/mock_browsing_data_cookie_helper.h"
erikwright (departed) 2011/07/19 14:40:33 Did you forget to add this file?
ycxiao1 2011/07/19 22:12:48 Done.
#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"
@@ -38,6 +39,8 @@
virtual void SetUp() {
profile_.reset(new TestingProfile());
profile_->CreateRequestContext();
+ mock_browsing_data_cookie_helper_ =
+ new MockBrowsingDataCookieHelper(profile_.get());
mock_browsing_data_database_helper_ =
new MockBrowsingDataDatabaseHelper(profile_.get());
mock_browsing_data_local_storage_helper_ =
@@ -53,18 +56,22 @@
}
CookiesTreeModel* CreateCookiesTreeModelWithInitialSample() {
- net::CookieMonster* monster = profile_->GetCookieMonster();
- monster->SetCookie(GURL("http://foo1"), "A=1");
- monster->SetCookie(GURL("http://foo2"), "B=1");
- monster->SetCookie(GURL("http://foo3"), "C=1");
CookiesTreeModel* cookies_model = new CookiesTreeModel(
- monster, mock_browsing_data_database_helper_,
+ 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_,
false);
+ mock_browsing_data_cookie_helper_->
+ AddCookieSamples(GURL("http://foo1"), "A=1");
+ mock_browsing_data_cookie_helper_->
+ AddCookieSamples(GURL("http://foo2"), "B=1");
+ mock_browsing_data_cookie_helper_->
+ AddCookieSamples(GURL("http://foo3"), "C=1");
+ mock_browsing_data_cookie_helper_->Notify();
mock_browsing_data_database_helper_->AddDatabaseSamples();
mock_browsing_data_database_helper_->Notify();
mock_browsing_data_local_storage_helper_->AddLocalStorageSamples();
@@ -91,6 +98,7 @@
// idbhost1 -> indexeddb -> http://idbhost1:1/,
// idbhost2 -> indexeddb -> http://idbhost2:2/.
EXPECT_EQ(41, 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/",
GetDisplayedLocalStorages(cookies_model));
@@ -104,20 +112,6 @@
return cookies_model;
}
- // Get the cookie names in the cookie list, as a comma seperated string.
- // (Note that the CookieMonster cookie list is sorted by domain.)
- // Ex:
- // monster->SetCookie(GURL("http://b"), "X=1")
- // monster->SetCookie(GURL("http://a"), "Y=1")
- // EXPECT_STREQ("Y,X", GetMonsterCookies(monster).c_str());
- std::string GetMonsterCookies(net::CookieMonster* monster) {
- std::vector<std::string> parts;
- net::CookieList cookie_list = monster->GetAllCookies();
- for (size_t i = 0; i < cookie_list.size(); ++i)
- parts.push_back(cookie_list[i].Name());
- return JoinString(parts, ',');
- }
-
std::string GetNodesOfChildren(
const CookieTreeNode* node,
CookieTreeNode::DetailedInfo::NodeType node_type) {
@@ -246,6 +240,8 @@
BrowserThread io_thread_;
scoped_ptr<TestingProfile> profile_;
+ scoped_refptr<MockBrowsingDataCookieHelper>
+ mock_browsing_data_cookie_helper_;
scoped_refptr<MockBrowsingDataDatabaseHelper>
mock_browsing_data_database_helper_;
scoped_refptr<MockBrowsingDataLocalStorageHelper>
@@ -263,12 +259,11 @@
TEST_F(CookiesTreeModelTest, RemoveAll) {
scoped_ptr<CookiesTreeModel> cookies_model(
CreateCookiesTreeModelWithInitialSample());
- net::CookieMonster* monster = profile_->GetCookieMonster();
// Reset the selection of the first row.
{
SCOPED_TRACE("Before removing");
- EXPECT_EQ(GetMonsterCookies(monster),
+ EXPECT_EQ("A,B,C",
GetDisplayedCookies(cookies_model.get()));
EXPECT_EQ("db1,db2",
GetDisplayedDatabases(cookies_model.get()));
@@ -282,6 +277,7 @@
GetDisplayedFileSystems(cookies_model.get()));
}
+ mock_browsing_data_cookie_helper_->Reset();
mock_browsing_data_database_helper_->Reset();
mock_browsing_data_local_storage_helper_->Reset();
mock_browsing_data_session_storage_helper_->Reset();
@@ -294,9 +290,8 @@
SCOPED_TRACE("After removing");
EXPECT_EQ(1, cookies_model->GetRoot()->GetTotalNodeCount());
EXPECT_EQ(0, cookies_model->GetRoot()->child_count());
- EXPECT_EQ(std::string(""), GetMonsterCookies(monster));
- EXPECT_EQ(GetMonsterCookies(monster),
- GetDisplayedCookies(cookies_model.get()));
+ EXPECT_EQ(std::string(""), GetDisplayedCookies(cookies_model.get()));
+ EXPECT_TRUE(mock_browsing_data_cookie_helper_->AllDeleted());
EXPECT_TRUE(mock_browsing_data_database_helper_->AllDeleted());
EXPECT_TRUE(mock_browsing_data_local_storage_helper_->AllDeleted());
EXPECT_FALSE(mock_browsing_data_session_storage_helper_->AllDeleted());
@@ -308,7 +303,6 @@
TEST_F(CookiesTreeModelTest, Remove) {
scoped_ptr<CookiesTreeModel> cookies_model(
CreateCookiesTreeModelWithInitialSample());
- net::CookieMonster* monster = profile_->GetCookieMonster();
// Children start out arranged as follows:
//
@@ -331,7 +325,6 @@
DeleteStoredObjects(cookies_model->GetRoot()->GetChild(11));
{
SCOPED_TRACE("`idbhost2` 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/",
@@ -347,7 +340,6 @@
DeleteStoredObjects(cookies_model->GetRoot()->GetChild(10));
{
SCOPED_TRACE("`idbhost1` 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/",
@@ -362,7 +354,6 @@
DeleteStoredObjects(cookies_model->GetRoot()->GetChild(9));
{
SCOPED_TRACE("`host2` 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/",
@@ -377,7 +368,6 @@
DeleteStoredObjects(cookies_model->GetRoot()->GetChild(8));
{
SCOPED_TRACE("`host1` 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("", GetDisplayedLocalStorages(cookies_model.get()));
@@ -390,7 +380,6 @@
DeleteStoredObjects(cookies_model->GetRoot()->GetChild(7));
{
SCOPED_TRACE("`gdbhost2` removed.");
- EXPECT_STREQ("A,B,C", GetMonsterCookies(monster).c_str());
EXPECT_STREQ("A,B,C", GetDisplayedCookies(cookies_model.get()).c_str());
EXPECT_EQ("db1", GetDisplayedDatabases(cookies_model.get()));
EXPECT_EQ("", GetDisplayedLocalStorages(cookies_model.get()));
@@ -403,7 +392,6 @@
DeleteStoredObjects(cookies_model->GetRoot()->GetChild(6));
{
SCOPED_TRACE("`gdbhost1` removed.");
- EXPECT_STREQ("A,B,C", GetMonsterCookies(monster).c_str());
EXPECT_STREQ("A,B,C", GetDisplayedCookies(cookies_model.get()).c_str());
EXPECT_EQ("", GetDisplayedDatabases(cookies_model.get()));
EXPECT_EQ("", GetDisplayedLocalStorages(cookies_model.get()));
@@ -416,7 +404,6 @@
DeleteStoredObjects(cookies_model->GetRoot()->GetChild(5));
{
SCOPED_TRACE("`fshost3` removed.");
- EXPECT_STREQ("A,B,C", GetMonsterCookies(monster).c_str());
EXPECT_STREQ("A,B,C", GetDisplayedCookies(cookies_model.get()).c_str());
EXPECT_EQ("", GetDisplayedDatabases(cookies_model.get()));
EXPECT_EQ("", GetDisplayedLocalStorages(cookies_model.get()));
@@ -429,7 +416,6 @@
DeleteStoredObjects(cookies_model->GetRoot()->GetChild(4));
{
SCOPED_TRACE("`fshost2` removed.");
- EXPECT_STREQ("A,B,C", GetMonsterCookies(monster).c_str());
EXPECT_STREQ("A,B,C", GetDisplayedCookies(cookies_model.get()).c_str());
EXPECT_EQ("", GetDisplayedDatabases(cookies_model.get()));
EXPECT_EQ("", GetDisplayedLocalStorages(cookies_model.get()));
@@ -442,7 +428,6 @@
DeleteStoredObjects(cookies_model->GetRoot()->GetChild(3));
{
SCOPED_TRACE("`fshost1` removed.");
- EXPECT_STREQ("A,B,C", GetMonsterCookies(monster).c_str());
EXPECT_STREQ("A,B,C", GetDisplayedCookies(cookies_model.get()).c_str());
EXPECT_EQ("", GetDisplayedDatabases(cookies_model.get()));
EXPECT_EQ("", GetDisplayedLocalStorages(cookies_model.get()));
@@ -454,7 +439,6 @@
DeleteStoredObjects(cookies_model->GetRoot()->GetChild(2));
{
SCOPED_TRACE("`foo3` removed.");
- EXPECT_STREQ("A,B", GetMonsterCookies(monster).c_str());
EXPECT_STREQ("A,B", GetDisplayedCookies(cookies_model.get()).c_str());
EXPECT_EQ("", GetDisplayedDatabases(cookies_model.get()));
EXPECT_EQ("", GetDisplayedLocalStorages(cookies_model.get()));
@@ -466,7 +450,6 @@
DeleteStoredObjects(cookies_model->GetRoot()->GetChild(1));
{
SCOPED_TRACE("`foo2` removed.");
- EXPECT_STREQ("A", GetMonsterCookies(monster).c_str());
EXPECT_STREQ("A", GetDisplayedCookies(cookies_model.get()).c_str());
EXPECT_EQ("", GetDisplayedDatabases(cookies_model.get()));
EXPECT_EQ("", GetDisplayedLocalStorages(cookies_model.get()));
@@ -478,7 +461,6 @@
DeleteStoredObjects(cookies_model->GetRoot()->GetChild(0));
{
SCOPED_TRACE("`foo1` removed.");
- EXPECT_STREQ("", GetMonsterCookies(monster).c_str());
EXPECT_STREQ("", GetDisplayedCookies(cookies_model.get()).c_str());
EXPECT_EQ("", GetDisplayedDatabases(cookies_model.get()));
EXPECT_EQ("", GetDisplayedLocalStorages(cookies_model.get()));
@@ -492,12 +474,10 @@
TEST_F(CookiesTreeModelTest, RemoveCookiesNode) {
scoped_ptr<CookiesTreeModel> cookies_model(
CreateCookiesTreeModelWithInitialSample());
- net::CookieMonster* monster = profile_->GetCookieMonster();
DeleteStoredObjects(cookies_model->GetRoot()->GetChild(0)->GetChild(0));
{
SCOPED_TRACE("First origin removed");
- EXPECT_STREQ("B,C", GetMonsterCookies(monster).c_str());
EXPECT_STREQ("B,C", GetDisplayedCookies(cookies_model.get()).c_str());
// 39 because in this case, the origin remains, although the COOKIES
// node beneath it has been deleted. So, we have
@@ -525,7 +505,6 @@
DeleteStoredObjects(cookies_model->GetRoot()->GetChild(6)->GetChild(0));
{
SCOPED_TRACE("First database removed");
- EXPECT_STREQ("B,C", GetMonsterCookies(monster).c_str());
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/",
@@ -542,7 +521,6 @@
DeleteStoredObjects(cookies_model->GetRoot()->GetChild(8)->GetChild(0));
{
SCOPED_TRACE("First origin removed");
- EXPECT_STREQ("B,C", GetMonsterCookies(monster).c_str());
EXPECT_STREQ("B,C", GetDisplayedCookies(cookies_model.get()).c_str());
EXPECT_EQ("db2", GetDisplayedDatabases(cookies_model.get()));
EXPECT_EQ("http://host2:2/",
@@ -560,12 +538,10 @@
TEST_F(CookiesTreeModelTest, RemoveCookieNode) {
scoped_ptr<CookiesTreeModel> cookies_model(
CreateCookiesTreeModelWithInitialSample());
- net::CookieMonster* monster = profile_->GetCookieMonster();
DeleteStoredObjects(cookies_model->GetRoot()->GetChild(1)->GetChild(0));
{
SCOPED_TRACE("Second origin COOKIES node removed");
- EXPECT_STREQ("A,C", GetMonsterCookies(monster).c_str());
EXPECT_STREQ("A,C", GetDisplayedCookies(cookies_model.get()).c_str());
EXPECT_EQ("db1,db2", GetDisplayedDatabases(cookies_model.get()));
EXPECT_EQ("http://host1:1/,http://host2:2/",
@@ -595,7 +571,6 @@
DeleteStoredObjects(cookies_model->GetRoot()->GetChild(6)->GetChild(0));
{
SCOPED_TRACE("First database removed");
- EXPECT_STREQ("A,C", GetMonsterCookies(monster).c_str());
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/",
@@ -612,7 +587,6 @@
DeleteStoredObjects(cookies_model->GetRoot()->GetChild(8)->GetChild(0));
{
SCOPED_TRACE("First origin removed");
- EXPECT_STREQ("A,C", GetMonsterCookies(monster).c_str());
EXPECT_STREQ("A,C", GetDisplayedCookies(cookies_model.get()).c_str());
EXPECT_EQ("db2", GetDisplayedDatabases(cookies_model.get()));
EXPECT_EQ("http://host2:2/",
@@ -628,12 +602,7 @@
}
TEST_F(CookiesTreeModelTest, RemoveSingleCookieNode) {
- net::CookieMonster* monster = profile_->GetCookieMonster();
- monster->SetCookie(GURL("http://foo1"), "A=1");
- monster->SetCookie(GURL("http://foo2"), "B=1");
- monster->SetCookie(GURL("http://foo3"), "C=1");
- monster->SetCookie(GURL("http://foo3"), "D=1");
- CookiesTreeModel cookies_model(monster,
+ 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_,
@@ -641,6 +610,15 @@
mock_browsing_data_indexed_db_helper_,
mock_browsing_data_file_system_helper_,
false);
+ mock_browsing_data_cookie_helper_->
+ AddCookieSamples(GURL("http://foo1"), "A=1");
+ mock_browsing_data_cookie_helper_->
+ AddCookieSamples(GURL("http://foo2"), "B=1");
+ mock_browsing_data_cookie_helper_->
+ AddCookieSamples(GURL("http://foo3"), "C=1");
+ mock_browsing_data_cookie_helper_->
+ AddCookieSamples(GURL("http://foo3"), "D=1");
+ mock_browsing_data_cookie_helper_->Notify();
mock_browsing_data_database_helper_->AddDatabaseSamples();
mock_browsing_data_database_helper_->Notify();
mock_browsing_data_local_storage_helper_->AddLocalStorageSamples();
@@ -667,7 +645,6 @@
// idbhost1 -> sessionstorage -> http://idbhost1:1/,
// 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));
EXPECT_EQ("http://host1:1/,http://host2:2/",
@@ -682,7 +659,6 @@
DeleteStoredObjects(cookies_model.GetRoot()->GetChild(2));
{
SCOPED_TRACE("Third origin removed");
- EXPECT_STREQ("A,B", GetMonsterCookies(monster).c_str());
EXPECT_STREQ("A,B", GetDisplayedCookies(&cookies_model).c_str());
EXPECT_EQ("db1,db2", GetDisplayedDatabases(&cookies_model));
EXPECT_EQ("http://host1:1/,http://host2:2/",
@@ -698,13 +674,7 @@
}
TEST_F(CookiesTreeModelTest, RemoveSingleCookieNodeOf3) {
- net::CookieMonster* monster = profile_->GetCookieMonster();
- monster->SetCookie(GURL("http://foo1"), "A=1");
- monster->SetCookie(GURL("http://foo2"), "B=1");
- monster->SetCookie(GURL("http://foo3"), "C=1");
- monster->SetCookie(GURL("http://foo3"), "D=1");
- monster->SetCookie(GURL("http://foo3"), "E=1");
- CookiesTreeModel cookies_model(monster,
+ 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_,
@@ -712,6 +682,17 @@
mock_browsing_data_indexed_db_helper_,
mock_browsing_data_file_system_helper_,
false);
+ mock_browsing_data_cookie_helper_->
+ AddCookieSamples(GURL("http://foo1"), "A=1");
+ mock_browsing_data_cookie_helper_->
+ AddCookieSamples(GURL("http://foo2"), "B=1");
+ mock_browsing_data_cookie_helper_->
+ AddCookieSamples(GURL("http://foo3"), "C=1");
+ mock_browsing_data_cookie_helper_->
+ AddCookieSamples(GURL("http://foo3"), "D=1");
+ mock_browsing_data_cookie_helper_->
+ AddCookieSamples(GURL("http://foo3"), "E=1");
+ mock_browsing_data_cookie_helper_->Notify();
mock_browsing_data_database_helper_->AddDatabaseSamples();
mock_browsing_data_database_helper_->Notify();
mock_browsing_data_local_storage_helper_->AddLocalStorageSamples();
@@ -739,7 +720,6 @@
// idbhost1 -> sessionstorage -> http://idbhost1:1/,
// 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));
EXPECT_EQ("http://host1:1/,http://host2:2/",
@@ -755,7 +735,6 @@
GetChild(1));
{
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(42, cookies_model.GetRoot()->GetTotalNodeCount());
EXPECT_EQ("db1,db2", GetDisplayedDatabases(&cookies_model));
@@ -771,13 +750,7 @@
}
TEST_F(CookiesTreeModelTest, RemoveSecondOrigin) {
- net::CookieMonster* monster = profile_->GetCookieMonster();
- monster->SetCookie(GURL("http://foo1"), "A=1");
- monster->SetCookie(GURL("http://foo2"), "B=1");
- monster->SetCookie(GURL("http://foo3"), "C=1");
- monster->SetCookie(GURL("http://foo3"), "D=1");
- monster->SetCookie(GURL("http://foo3"), "E=1");
- CookiesTreeModel cookies_model(monster,
+ 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_,
@@ -785,18 +758,28 @@
mock_browsing_data_indexed_db_helper_,
mock_browsing_data_file_system_helper_,
false);
+ mock_browsing_data_cookie_helper_->
+ AddCookieSamples(GURL("http://foo1"), "A=1");
+ mock_browsing_data_cookie_helper_->
+ AddCookieSamples(GURL("http://foo2"), "B=1");
+ mock_browsing_data_cookie_helper_->
+ AddCookieSamples(GURL("http://foo3"), "C=1");
+ mock_browsing_data_cookie_helper_->
+ AddCookieSamples(GURL("http://foo3"), "D=1");
+ mock_browsing_data_cookie_helper_->
+ AddCookieSamples(GURL("http://foo3"), "E=1");
+ mock_browsing_data_cookie_helper_->Notify();
+
{
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_STREQ("A,B,C,D,E", GetMonsterCookies(monster).c_str());
EXPECT_STREQ("A,B,C,D,E", GetDisplayedCookies(&cookies_model).c_str());
}
DeleteStoredObjects(cookies_model.GetRoot()->GetChild(1));
{
SCOPED_TRACE("Second origin removed");
- EXPECT_STREQ("A,C,D,E", GetMonsterCookies(monster).c_str());
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());
@@ -804,55 +787,58 @@
}
TEST_F(CookiesTreeModelTest, OriginOrdering) {
- net::CookieMonster* monster = profile_->GetCookieMonster();
- monster->SetCookie(GURL("http://a.foo2.com"), "A=1");
- monster->SetCookie(GURL("http://foo2.com"), "B=1");
- monster->SetCookie(GURL("http://b.foo1.com"), "C=1");
- monster->SetCookie(GURL("http://foo4.com"), "D=1; domain=.foo4.com;"
- " path=/;"); // Leading dot on the foo4
- monster->SetCookie(GURL("http://a.foo1.com"), "E=1");
- monster->SetCookie(GURL("http://foo1.com"), "F=1");
- monster->SetCookie(GURL("http://foo3.com"), "G=1");
- monster->SetCookie(GURL("http://foo4.com"), "H=1");
+ 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_,
+ false);
+ mock_browsing_data_cookie_helper_->
+ AddCookieSamples(GURL("http://a.foo2.com"), "A=1");
+ mock_browsing_data_cookie_helper_->
+ AddCookieSamples(GURL("http://foo2.com"), "B=1");
+ mock_browsing_data_cookie_helper_->
+ AddCookieSamples(GURL("http://b.foo1.com"), "C=1");
+ // Leading dot on the foo4
+ mock_browsing_data_cookie_helper_->AddCookieSamples(
+ GURL("http://foo4.com"), "D=1; domain=.foo4.com; path=/;");
+ mock_browsing_data_cookie_helper_->
+ AddCookieSamples(GURL("http://a.foo1.com"), "E=1");
+ mock_browsing_data_cookie_helper_->
+ AddCookieSamples(GURL("http://foo1.com"), "F=1");
+ mock_browsing_data_cookie_helper_->
+ AddCookieSamples(GURL("http://foo3.com"), "G=1");
+ mock_browsing_data_cookie_helper_->
+ AddCookieSamples(GURL("http://foo4.com"), "H=1");
+ mock_browsing_data_cookie_helper_->Notify();
- CookiesTreeModel cookies_model(monster,
- new MockBrowsingDataDatabaseHelper(profile_.get()),
- new MockBrowsingDataLocalStorageHelper(profile_.get()),
- new MockBrowsingDataLocalStorageHelper(profile_.get()),
- new MockBrowsingDataAppCacheHelper(profile_.get()),
- new MockBrowsingDataIndexedDBHelper(profile_.get()),
- new MockBrowsingDataFileSystemHelper(profile_.get()),
- false);
-
{
SCOPED_TRACE("Initial State 8 cookies");
- // CookieMonster orders cookies by pathlength, then by creation time.
- // All paths are length 1.
- EXPECT_STREQ("A,B,C,D,E,F,G,H", GetMonsterCookies(monster).c_str());
+ EXPECT_EQ(23, 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"
{
- EXPECT_STREQ("A,B,C,D,F,G,H", GetMonsterCookies(monster).c_str());
EXPECT_STREQ("F,C,B,A,G,D,H", GetDisplayedCookies(&cookies_model).c_str());
}
}
TEST_F(CookiesTreeModelTest, ContentSettings) {
GURL host("http://example.com/");
- net::CookieMonster* monster = profile_->GetCookieMonster();
- monster->SetCookie(host, "A=1");
+ 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_,
+ false);
+ mock_browsing_data_cookie_helper_->AddCookieSamples(host, "A=1");
+ mock_browsing_data_cookie_helper_->Notify();
- CookiesTreeModel cookies_model(monster,
- new MockBrowsingDataDatabaseHelper(profile_.get()),
- new MockBrowsingDataLocalStorageHelper(profile_.get()),
- new MockBrowsingDataLocalStorageHelper(profile_.get()),
- new MockBrowsingDataAppCacheHelper(profile_.get()),
- new MockBrowsingDataIndexedDBHelper(profile_.get()),
- new MockBrowsingDataFileSystemHelper(profile_.get()),
- false);
-
TestingProfile profile;
HostContentSettingsMap* content_settings =
profile.GetHostContentSettingsMap();
« chrome/browser/cookies_tree_model.h ('K') | « chrome/browser/cookies_tree_model.cc ('k') | chrome/browser/ui/webui/options/cookies_view_handler.cc » ('j') | net/base/cookie_monster.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698