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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/cookies/cookie_monster_unittest.cc

Issue 1378273003: Decouple CookieMonsterTest from CookieStoreTest. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 2 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 | « no previous file | net/cookies/cookie_store_unittest.h » ('j') | net/cookies/cookie_store_unittest.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/cookies/cookie_monster_unittest.cc
diff --git a/net/cookies/cookie_monster_unittest.cc b/net/cookies/cookie_monster_unittest.cc
index c4df76558d7ccde4f6d40add0a4cbfca65bdbc51..25573fdf052e9d2546aa3908d1c95e267c728bc1 100644
--- a/net/cookies/cookie_monster_unittest.cc
+++ b/net/cookies/cookie_monster_unittest.cc
@@ -70,7 +70,6 @@ const char kTopLevelDomainPlus2[] = "http://www.math.harvard.edu";
const char kTopLevelDomainPlus2Secure[] = "https://www.math.harvard.edu";
const char kTopLevelDomainPlus3[] = "http://www.bourbaki.math.harvard.edu";
const char kOtherDomain[] = "http://www.mit.edu";
-const char kUrlGoogleSpecific[] = "http://www.gmail.google.izzle";
class GetCookieListCallback : public CookieCallback {
public:
@@ -359,8 +358,9 @@ class CookieMonsterTest : public CookieStoreTest<CookieMonsterTestTraits> {
scoped_refptr<CookieMonster> cm(new CookieMonster(NULL, NULL));
for (int i = 0; i < more_than_enough_cookies; ++i) {
std::string cookie = base::StringPrintf("a%03d=b", i);
- EXPECT_TRUE(SetCookie(cm.get(), url_google_, cookie));
- std::string cookies = this->GetCookies(cm.get(), url_google_);
+ EXPECT_TRUE(SetCookie(cm.get(), http_www_google_.url(), cookie));
+ std::string cookies =
+ this->GetCookies(cm.get(), http_www_google_.url());
// Make sure we find it in the cookies.
EXPECT_NE(cookies.find(cookie), std::string::npos);
// Count the number of cookies.
@@ -371,15 +371,17 @@ class CookieMonsterTest : public CookieStoreTest<CookieMonsterTestTraits> {
// Add a bunch of cookies on multiple hosts within a single eTLD.
// Should keep at least kDomainMaxCookies - kDomainPurgeCookies
// between them. We shouldn't go above kDomainMaxCookies for both together.
- GURL url_google_specific(kUrlGoogleSpecific);
+ GURL url_google_specific(http_www_google_.Format("http://www.gmail.%D"));
{
scoped_refptr<CookieMonster> cm(new CookieMonster(NULL, NULL));
for (int i = 0; i < more_than_enough_cookies; ++i) {
std::string cookie_general = base::StringPrintf("a%03d=b", i);
- EXPECT_TRUE(SetCookie(cm.get(), url_google_, cookie_general));
+ EXPECT_TRUE(
+ SetCookie(cm.get(), http_www_google_.url(), cookie_general));
std::string cookie_specific = base::StringPrintf("c%03d=b", i);
EXPECT_TRUE(SetCookie(cm.get(), url_google_specific, cookie_specific));
- std::string cookies_general = this->GetCookies(cm.get(), url_google_);
+ std::string cookies_general =
+ this->GetCookies(cm.get(), http_www_google_.url());
EXPECT_NE(cookies_general.find(cookie_general), std::string::npos);
std::string cookies_specific =
this->GetCookies(cm.get(), url_google_specific);
@@ -390,7 +392,8 @@ class CookieMonsterTest : public CookieStoreTest<CookieMonsterTestTraits> {
}
// After all this, there should be at least
// kDomainMaxCookies - kDomainPurgeCookies for both URLs.
- std::string cookies_general = this->GetCookies(cm.get(), url_google_);
+ std::string cookies_general =
+ this->GetCookies(cm.get(), http_www_google_.url());
std::string cookies_specific =
this->GetCookies(cm.get(), url_google_specific);
int total_cookies = (CountInString(cookies_general, '=') +
@@ -413,8 +416,8 @@ class CookieMonsterTest : public CookieStoreTest<CookieMonsterTestTraits> {
return COOKIE_PRIORITY_DEFAULT;
}
- // Instantiates a CookieMonster, adds multiple cookies (to url_google_) with
- // priorities specified by |coded_priority_str|, and tests priority-aware
+ // Instantiates a CookieMonster, adds multiple cookies (to http_www_google_)
+ // with priorities specified by |coded_priority_str|, and tests priority-aware
// domain cookie eviction.
// |coded_priority_str| specifies a run-length-encoded string of priorities.
// Example: "2M 3L M 4H" means "MMLLLMHHHH", and speicifies sequential (i.e.,
@@ -453,7 +456,7 @@ class CookieMonsterTest : public CookieStoreTest<CookieMonsterTestTraits> {
for (; rep > 0; --rep, ++next_cookie_id) {
std::string cookie = base::StringPrintf(
"a%d=b;priority=%s", next_cookie_id, priority_str.c_str());
- EXPECT_TRUE(SetCookie(cm, url_google_, cookie));
+ EXPECT_TRUE(SetCookie(cm, http_www_google_.url(), cookie));
priority_list.push_back(priority);
id_list[priority].push_back(next_cookie_id);
}
@@ -463,7 +466,7 @@ class CookieMonsterTest : public CookieStoreTest<CookieMonsterTestTraits> {
std::vector<int> surviving_id_list[3]; // Indexed by CookiePriority.
// Parse the list of cookies
- std::string cookie_str = this->GetCookies(cm, url_google_);
+ std::string cookie_str = this->GetCookies(cm, http_www_google_.url());
for (const std::string& token : base::SplitString(
cookie_str, ";", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL)) {
// Assuming *it is "a#=b", so extract and parse "#" portion.
@@ -816,20 +819,21 @@ class DeferredCookieTaskTest : public CookieMonsterTest {
};
TEST_F(DeferredCookieTaskTest, DeferredGetCookies) {
- DeclareLoadedCookie("www.google.izzle",
+ DeclareLoadedCookie(http_www_google_.host(),
"X=1; path=/; expires=Mon, 18-Apr-22 22:50:14 GMT",
Time::Now() + TimeDelta::FromDays(3));
MockGetCookiesCallback get_cookies_callback;
BeginWithForDomainKey(
- "google.izzle",
- GetCookiesAction(&cookie_monster(), url_google_, &get_cookies_callback));
+ http_www_google_.domain(),
+ GetCookiesAction(&cookie_monster(), http_www_google_.url(),
+ &get_cookies_callback));
WaitForLoadCall();
EXPECT_CALL(get_cookies_callback, Invoke("X=1"))
- .WillOnce(GetCookiesAction(&cookie_monster(), url_google_,
+ .WillOnce(GetCookiesAction(&cookie_monster(), http_www_google_.url(),
&get_cookies_callback));
EXPECT_CALL(get_cookies_callback, Invoke("X=1"))
.WillOnce(QuitCurrentMessageLoop());
@@ -840,15 +844,16 @@ TEST_F(DeferredCookieTaskTest, DeferredGetCookies) {
TEST_F(DeferredCookieTaskTest, DeferredSetCookie) {
MockSetCookiesCallback set_cookies_callback;
- BeginWithForDomainKey("google.izzle",
- SetCookieAction(&cookie_monster(), url_google_, "A=B",
- &set_cookies_callback));
+ BeginWithForDomainKey(
+ http_www_google_.domain(),
+ SetCookieAction(&cookie_monster(), http_www_google_.url(), "A=B",
+ &set_cookies_callback));
WaitForLoadCall();
EXPECT_CALL(set_cookies_callback, Invoke(true))
- .WillOnce(SetCookieAction(&cookie_monster(), url_google_, "X=Y",
- &set_cookies_callback));
+ .WillOnce(SetCookieAction(&cookie_monster(), http_www_google_.url(),
+ "X=Y", &set_cookies_callback));
EXPECT_CALL(set_cookies_callback, Invoke(true))
.WillOnce(QuitCurrentMessageLoop());
@@ -858,10 +863,12 @@ TEST_F(DeferredCookieTaskTest, DeferredSetCookie) {
TEST_F(DeferredCookieTaskTest, DeferredSetAllCookies) {
MockSetCookiesCallback set_cookies_callback;
CookieList list;
- list.push_back(CanonicalCookie(url_google_, "A", "B", "google.izzle", "/",
+ list.push_back(CanonicalCookie(http_www_google_.url(), "A", "B",
+ http_www_google_.domain(), "/",
base::Time::Now(), base::Time(), base::Time(),
false, true, false, COOKIE_PRIORITY_DEFAULT));
- list.push_back(CanonicalCookie(url_google_, "C", "D", "google.izzle", "/",
+ list.push_back(CanonicalCookie(http_www_google_.url(), "C", "D",
+ http_www_google_.domain(), "/",
base::Time::Now(), base::Time(), base::Time(),
false, true, false, COOKIE_PRIORITY_DEFAULT));
@@ -882,15 +889,16 @@ TEST_F(DeferredCookieTaskTest, DeferredSetAllCookies) {
TEST_F(DeferredCookieTaskTest, DeferredDeleteCookie) {
MockClosure delete_cookie_callback;
- BeginWithForDomainKey("google.izzle",
- DeleteCookieAction(&cookie_monster(), url_google_, "A",
- &delete_cookie_callback));
+ BeginWithForDomainKey(
+ http_www_google_.domain(),
+ DeleteCookieAction(&cookie_monster(), http_www_google_.url(), "A",
+ &delete_cookie_callback));
WaitForLoadCall();
EXPECT_CALL(delete_cookie_callback, Invoke())
- .WillOnce(DeleteCookieAction(&cookie_monster(), url_google_, "X",
- &delete_cookie_callback));
+ .WillOnce(DeleteCookieAction(&cookie_monster(), http_www_google_.url(),
+ "X", &delete_cookie_callback));
EXPECT_CALL(delete_cookie_callback, Invoke())
.WillOnce(QuitCurrentMessageLoop());
@@ -900,7 +908,7 @@ TEST_F(DeferredCookieTaskTest, DeferredDeleteCookie) {
TEST_F(DeferredCookieTaskTest, DeferredSetCookieWithDetails) {
MockSetCookiesCallback set_cookies_callback;
- CookiesInputInfo cookie_info = {url_google_foo_,
+ CookiesInputInfo cookie_info = {www_google_foo_.url(),
"A",
"B",
std::string(),
@@ -911,12 +919,13 @@ TEST_F(DeferredCookieTaskTest, DeferredSetCookieWithDetails) {
false,
COOKIE_PRIORITY_DEFAULT};
BeginWithForDomainKey(
- "google.izzle", SetCookieWithDetailsAction(&cookie_monster(), cookie_info,
- &set_cookies_callback));
+ http_www_google_.domain(),
+ SetCookieWithDetailsAction(&cookie_monster(), cookie_info,
+ &set_cookies_callback));
WaitForLoadCall();
- CookiesInputInfo cookie_info_exp = {url_google_foo_,
+ CookiesInputInfo cookie_info_exp = {www_google_foo_.url(),
"A",
"B",
std::string(),
@@ -936,7 +945,7 @@ TEST_F(DeferredCookieTaskTest, DeferredSetCookieWithDetails) {
}
TEST_F(DeferredCookieTaskTest, DeferredGetAllCookies) {
- DeclareLoadedCookie("www.google.izzle",
+ DeclareLoadedCookie(http_www_google_.host(),
"X=1; path=/; expires=Mon, 18-Apr-22 22:50:14 GMT",
Time::Now() + TimeDelta::FromDays(3));
@@ -956,20 +965,22 @@ TEST_F(DeferredCookieTaskTest, DeferredGetAllCookies) {
}
TEST_F(DeferredCookieTaskTest, DeferredGetAllForUrlCookies) {
- DeclareLoadedCookie("www.google.izzle",
+ DeclareLoadedCookie(http_www_google_.host(),
"X=1; path=/; expires=Mon, 18-Apr-22 22:50:14 GMT",
Time::Now() + TimeDelta::FromDays(3));
MockGetCookieListCallback get_cookie_list_callback;
BeginWithForDomainKey(
- "google.izzle", GetAllCookiesForUrlAction(&cookie_monster(), url_google_,
- &get_cookie_list_callback));
+ http_www_google_.domain(),
+ GetAllCookiesForUrlAction(&cookie_monster(), http_www_google_.url(),
+ &get_cookie_list_callback));
WaitForLoadCall();
EXPECT_CALL(get_cookie_list_callback, Invoke(testing::_))
- .WillOnce(GetAllCookiesForUrlAction(&cookie_monster(), url_google_,
+ .WillOnce(GetAllCookiesForUrlAction(&cookie_monster(),
+ http_www_google_.url(),
&get_cookie_list_callback));
EXPECT_CALL(get_cookie_list_callback, Invoke(testing::_))
.WillOnce(QuitCurrentMessageLoop());
@@ -978,21 +989,23 @@ TEST_F(DeferredCookieTaskTest, DeferredGetAllForUrlCookies) {
}
TEST_F(DeferredCookieTaskTest, DeferredGetAllForUrlWithOptionsCookies) {
- DeclareLoadedCookie("www.google.izzle",
+ DeclareLoadedCookie(http_www_google_.host(),
"X=1; path=/; expires=Mon, 18-Apr-22 22:50:14 GMT",
Time::Now() + TimeDelta::FromDays(3));
MockGetCookieListCallback get_cookie_list_callback;
- BeginWithForDomainKey("google.izzle", GetAllCookiesForUrlWithOptionsAction(
- &cookie_monster(), url_google_,
- &get_cookie_list_callback));
+ BeginWithForDomainKey(http_www_google_.domain(),
+ GetAllCookiesForUrlWithOptionsAction(
+ &cookie_monster(), http_www_google_.url(),
+ &get_cookie_list_callback));
WaitForLoadCall();
EXPECT_CALL(get_cookie_list_callback, Invoke(testing::_))
.WillOnce(GetAllCookiesForUrlWithOptionsAction(
- &cookie_monster(), url_google_, &get_cookie_list_callback));
+ &cookie_monster(), http_www_google_.url(),
+ &get_cookie_list_callback));
EXPECT_CALL(get_cookie_list_callback, Invoke(testing::_))
.WillOnce(QuitCurrentMessageLoop());
@@ -1036,14 +1049,15 @@ TEST_F(DeferredCookieTaskTest, DeferredDeleteAllForHostCookies) {
MockDeleteCallback delete_callback;
BeginWithForDomainKey(
- "google.izzle",
- DeleteAllForHostAction(&cookie_monster(), url_google_, &delete_callback));
+ http_www_google_.domain(),
+ DeleteAllForHostAction(&cookie_monster(), http_www_google_.url(),
+ &delete_callback));
WaitForLoadCall();
EXPECT_CALL(delete_callback, Invoke(false))
- .WillOnce(DeleteAllForHostAction(&cookie_monster(), url_google_,
- &delete_callback));
+ .WillOnce(DeleteAllForHostAction(
+ &cookie_monster(), http_www_google_.url(), &delete_callback));
EXPECT_CALL(delete_callback, Invoke(false))
.WillOnce(QuitCurrentMessageLoop());
@@ -1052,8 +1066,8 @@ TEST_F(DeferredCookieTaskTest, DeferredDeleteAllForHostCookies) {
TEST_F(DeferredCookieTaskTest, DeferredDeleteCanonicalCookie) {
std::vector<CanonicalCookie*> cookies;
- CanonicalCookie cookie =
- BuildCanonicalCookie("www.google.com", "X=1; path=/", base::Time::Now());
+ CanonicalCookie cookie = BuildCanonicalCookie(
+ http_www_google_.host(), "X=1; path=/", base::Time::Now());
MockDeleteCookieCallback delete_cookie_callback;
@@ -1091,7 +1105,7 @@ TEST_F(DeferredCookieTaskTest, DeferredDeleteSessionCookies) {
// the backing store and that new tasks received while the queued tasks are
// being dispatched go to the end of the queue.
TEST_F(DeferredCookieTaskTest, DeferredTaskOrder) {
- DeclareLoadedCookie("www.google.izzle",
+ DeclareLoadedCookie(http_www_google_.host(),
"X=1; path=/; expires=Mon, 18-Apr-22 22:50:14 GMT",
Time::Now() + TimeDelta::FromDays(3));
@@ -1100,17 +1114,18 @@ TEST_F(DeferredCookieTaskTest, DeferredTaskOrder) {
MockGetCookiesCallback get_cookies_callback_deferred;
EXPECT_CALL(*this, Begin())
- .WillOnce(testing::DoAll(GetCookiesAction(&cookie_monster(), url_google_,
- &get_cookies_callback),
- SetCookieAction(&cookie_monster(), url_google_,
- "A=B", &set_cookies_callback)));
+ .WillOnce(testing::DoAll(
+ GetCookiesAction(&cookie_monster(), http_www_google_.url(),
+ &get_cookies_callback),
+ SetCookieAction(&cookie_monster(), http_www_google_.url(), "A=B",
+ &set_cookies_callback)));
ExpectLoadCall();
- ExpectLoadForKeyCall("google.izzle", false);
+ ExpectLoadForKeyCall(http_www_google_.domain(), false);
Begin();
WaitForLoadCall();
EXPECT_CALL(get_cookies_callback, Invoke("X=1"))
- .WillOnce(GetCookiesAction(&cookie_monster(), url_google_,
+ .WillOnce(GetCookiesAction(&cookie_monster(), http_www_google_.url(),
&get_cookies_callback_deferred));
EXPECT_CALL(set_cookies_callback, Invoke(true));
EXPECT_CALL(get_cookies_callback_deferred, Invoke("A=B; X=1"))
@@ -1125,20 +1140,22 @@ TEST_F(CookieMonsterTest, TestCookieDeleteAll) {
CookieOptions options;
options.set_include_httponly();
- EXPECT_TRUE(SetCookie(cm.get(), url_google_, kValidCookieLine));
- EXPECT_EQ("A=B", GetCookies(cm.get(), url_google_));
+ EXPECT_TRUE(SetCookie(cm.get(), http_www_google_.url(), kValidCookieLine));
+ EXPECT_EQ("A=B", GetCookies(cm.get(), http_www_google_.url()));
- EXPECT_TRUE(
- SetCookieWithOptions(cm.get(), url_google_, "C=D; httponly", options));
- EXPECT_EQ("A=B; C=D", GetCookiesWithOptions(cm.get(), url_google_, options));
+ EXPECT_TRUE(SetCookieWithOptions(cm.get(), http_www_google_.url(),
+ "C=D; httponly", options));
+ EXPECT_EQ("A=B; C=D",
+ GetCookiesWithOptions(cm.get(), http_www_google_.url(), options));
EXPECT_EQ(2, DeleteAll(cm.get()));
- EXPECT_EQ("", GetCookiesWithOptions(cm.get(), url_google_, options));
+ EXPECT_EQ("",
+ GetCookiesWithOptions(cm.get(), http_www_google_.url(), options));
EXPECT_EQ(0u, store->commands().size());
// Create a persistent cookie.
EXPECT_TRUE(SetCookie(
- cm.get(), url_google_,
+ cm.get(), http_www_google_.url(),
std::string(kValidCookieLine) + "; expires=Mon, 18-Apr-22 22:50:13 GMT"));
ASSERT_EQ(1u, store->commands().size());
EXPECT_EQ(CookieStoreCommand::ADD, store->commands()[0].type);
@@ -1147,7 +1164,8 @@ TEST_F(CookieMonsterTest, TestCookieDeleteAll) {
ASSERT_EQ(2u, store->commands().size());
EXPECT_EQ(CookieStoreCommand::REMOVE, store->commands()[1].type);
- EXPECT_EQ("", GetCookiesWithOptions(cm.get(), url_google_, options));
+ EXPECT_EQ("",
+ GetCookiesWithOptions(cm.get(), http_www_google_.url(), options));
}
TEST_F(CookieMonsterTest, TestCookieDeleteAllCreatedBetweenTimestamps) {
@@ -1159,15 +1177,16 @@ TEST_F(CookieMonsterTest, TestCookieDeleteAllCreatedBetweenTimestamps) {
Time()));
// Create 3 cookies with creation date of today, yesterday and the day before.
- EXPECT_TRUE(cm->SetCookieWithCreationTime(url_google_, "T-0=Now", now));
- EXPECT_TRUE(cm->SetCookieWithCreationTime(url_google_, "T-1=Yesterday",
- now - TimeDelta::FromDays(1)));
- EXPECT_TRUE(cm->SetCookieWithCreationTime(url_google_, "T-2=DayBefore",
- now - TimeDelta::FromDays(2)));
- EXPECT_TRUE(cm->SetCookieWithCreationTime(url_google_, "T-3=ThreeDays",
- now - TimeDelta::FromDays(3)));
- EXPECT_TRUE(cm->SetCookieWithCreationTime(url_google_, "T-7=LastWeek",
- now - TimeDelta::FromDays(7)));
+ EXPECT_TRUE(
+ cm->SetCookieWithCreationTime(http_www_google_.url(), "T-0=Now", now));
+ EXPECT_TRUE(cm->SetCookieWithCreationTime(
+ http_www_google_.url(), "T-1=Yesterday", now - TimeDelta::FromDays(1)));
+ EXPECT_TRUE(cm->SetCookieWithCreationTime(
+ http_www_google_.url(), "T-2=DayBefore", now - TimeDelta::FromDays(2)));
+ EXPECT_TRUE(cm->SetCookieWithCreationTime(
+ http_www_google_.url(), "T-3=ThreeDays", now - TimeDelta::FromDays(3)));
+ EXPECT_TRUE(cm->SetCookieWithCreationTime(
+ http_www_google_.url(), "T-7=LastWeek", now - TimeDelta::FromDays(7)));
// Try to delete threedays and the daybefore.
EXPECT_EQ(2, DeleteAllCreatedBetween(cm.get(), now - TimeDelta::FromDays(3),
@@ -1195,18 +1214,18 @@ TEST_F(CookieMonsterTest, TestLastAccess) {
scoped_refptr<CookieMonster> cm(
new CookieMonster(NULL, NULL, kLastAccessThresholdMilliseconds));
- EXPECT_TRUE(SetCookie(cm.get(), url_google_, "A=B"));
+ EXPECT_TRUE(SetCookie(cm.get(), http_www_google_.url(), "A=B"));
const Time last_access_date(GetFirstCookieAccessDate(cm.get()));
// Reading the cookie again immediately shouldn't update the access date,
// since we're inside the threshold.
- EXPECT_EQ("A=B", GetCookies(cm.get(), url_google_));
+ EXPECT_EQ("A=B", GetCookies(cm.get(), http_www_google_.url()));
EXPECT_TRUE(last_access_date == GetFirstCookieAccessDate(cm.get()));
// Reading after a short wait should update the access date.
base::PlatformThread::Sleep(
base::TimeDelta::FromMilliseconds(kAccessDelayMs));
- EXPECT_EQ("A=B", GetCookies(cm.get(), url_google_));
+ EXPECT_EQ("A=B", GetCookies(cm.get(), http_www_google_.url()));
EXPECT_FALSE(last_access_date == GetFirstCookieAccessDate(cm.get()));
}
@@ -1221,16 +1240,17 @@ TEST_F(CookieMonsterTest, TestPriorityAwareGarbageCollection) {
TEST_F(CookieMonsterTest, TestDeleteSingleCookie) {
scoped_refptr<CookieMonster> cm(new CookieMonster(NULL, NULL));
- EXPECT_TRUE(SetCookie(cm.get(), url_google_, "A=B"));
- EXPECT_TRUE(SetCookie(cm.get(), url_google_, "C=D"));
- EXPECT_TRUE(SetCookie(cm.get(), url_google_, "E=F"));
- EXPECT_EQ("A=B; C=D; E=F", GetCookies(cm.get(), url_google_));
+ EXPECT_TRUE(SetCookie(cm.get(), http_www_google_.url(), "A=B"));
+ EXPECT_TRUE(SetCookie(cm.get(), http_www_google_.url(), "C=D"));
+ EXPECT_TRUE(SetCookie(cm.get(), http_www_google_.url(), "E=F"));
+ EXPECT_EQ("A=B; C=D; E=F", GetCookies(cm.get(), http_www_google_.url()));
- EXPECT_TRUE(FindAndDeleteCookie(cm.get(), url_google_.host(), "C"));
- EXPECT_EQ("A=B; E=F", GetCookies(cm.get(), url_google_));
+ EXPECT_TRUE(
+ FindAndDeleteCookie(cm.get(), http_www_google_.url().host(), "C"));
+ EXPECT_EQ("A=B; E=F", GetCookies(cm.get(), http_www_google_.url()));
EXPECT_FALSE(FindAndDeleteCookie(cm.get(), "random.host", "E"));
- EXPECT_EQ("A=B; E=F", GetCookies(cm.get(), url_google_));
+ EXPECT_EQ("A=B; E=F", GetCookies(cm.get(), http_www_google_.url()));
}
TEST_F(CookieMonsterTest, SetCookieableSchemes) {
@@ -1258,13 +1278,14 @@ TEST_F(CookieMonsterTest, GetAllCookiesForURL) {
CookieOptions options;
options.set_include_httponly();
- EXPECT_TRUE(
- SetCookieWithOptions(cm.get(), url_google_, "A=B; httponly", options));
- EXPECT_TRUE(SetCookieWithOptions(cm.get(), url_google_,
- "C=D; domain=.google.izzle", options));
- EXPECT_TRUE(SetCookieWithOptions(cm.get(), url_google_secure_,
- "E=F; domain=.google.izzle; secure",
+ EXPECT_TRUE(SetCookieWithOptions(cm.get(), http_www_google_.url(),
+ "A=B; httponly", options));
+ EXPECT_TRUE(SetCookieWithOptions(cm.get(), http_www_google_.url(),
+ http_www_google_.Format("C=D; domain=.%D"),
options));
+ EXPECT_TRUE(SetCookieWithOptions(
+ cm.get(), https_www_google_.url(),
+ http_www_google_.Format("E=F; domain=.%D; secure"), options));
const Time last_access_date(GetFirstCookieAccessDate(cm.get()));
@@ -1272,44 +1293,44 @@ TEST_F(CookieMonsterTest, GetAllCookiesForURL) {
base::TimeDelta::FromMilliseconds(kAccessDelayMs));
// Check cookies for url.
- CookieList cookies = GetAllCookiesForURL(cm.get(), url_google_);
+ CookieList cookies = GetAllCookiesForURL(cm.get(), http_www_google_.url());
CookieList::iterator it = cookies.begin();
ASSERT_TRUE(it != cookies.end());
- EXPECT_EQ("www.google.izzle", it->Domain());
+ EXPECT_EQ(http_www_google_.host(), it->Domain());
EXPECT_EQ("A", it->Name());
ASSERT_TRUE(++it != cookies.end());
- EXPECT_EQ(".google.izzle", it->Domain());
+ EXPECT_EQ(http_www_google_.Format(".%D"), it->Domain());
EXPECT_EQ("C", it->Name());
ASSERT_TRUE(++it == cookies.end());
// Check cookies for url excluding http-only cookies.
- cookies =
- GetAllCookiesForURLWithOptions(cm.get(), url_google_, CookieOptions());
+ cookies = GetAllCookiesForURLWithOptions(cm.get(), http_www_google_.url(),
+ CookieOptions());
it = cookies.begin();
ASSERT_TRUE(it != cookies.end());
- EXPECT_EQ(".google.izzle", it->Domain());
+ EXPECT_EQ(http_www_google_.Format(".%D"), it->Domain());
EXPECT_EQ("C", it->Name());
ASSERT_TRUE(++it == cookies.end());
// Test secure cookies.
- cookies = GetAllCookiesForURL(cm.get(), url_google_secure_);
+ cookies = GetAllCookiesForURL(cm.get(), https_www_google_.url());
it = cookies.begin();
ASSERT_TRUE(it != cookies.end());
- EXPECT_EQ("www.google.izzle", it->Domain());
+ EXPECT_EQ(http_www_google_.host(), it->Domain());
EXPECT_EQ("A", it->Name());
ASSERT_TRUE(++it != cookies.end());
- EXPECT_EQ(".google.izzle", it->Domain());
+ EXPECT_EQ(http_www_google_.Format(".%D"), it->Domain());
EXPECT_EQ("C", it->Name());
ASSERT_TRUE(++it != cookies.end());
- EXPECT_EQ(".google.izzle", it->Domain());
+ EXPECT_EQ(http_www_google_.Format(".%D"), it->Domain());
EXPECT_EQ("E", it->Name());
ASSERT_TRUE(++it == cookies.end());
@@ -1322,13 +1343,14 @@ TEST_F(CookieMonsterTest, GetAllCookiesForURLPathMatching) {
scoped_refptr<CookieMonster> cm(new CookieMonster(NULL, NULL));
CookieOptions options;
- EXPECT_TRUE(SetCookieWithOptions(cm.get(), url_google_foo_, "A=B; path=/foo;",
- options));
- EXPECT_TRUE(SetCookieWithOptions(cm.get(), url_google_bar_, "C=D; path=/bar;",
- options));
- EXPECT_TRUE(SetCookieWithOptions(cm.get(), url_google_, "E=F;", options));
+ EXPECT_TRUE(SetCookieWithOptions(cm.get(), www_google_foo_.url(),
+ "A=B; path=/foo;", options));
+ EXPECT_TRUE(SetCookieWithOptions(cm.get(), www_google_bar_.url(),
+ "C=D; path=/bar;", options));
+ EXPECT_TRUE(
+ SetCookieWithOptions(cm.get(), http_www_google_.url(), "E=F;", options));
- CookieList cookies = GetAllCookiesForURL(cm.get(), url_google_foo_);
+ CookieList cookies = GetAllCookiesForURL(cm.get(), www_google_foo_.url());
CookieList::iterator it = cookies.begin();
ASSERT_TRUE(it != cookies.end());
@@ -1341,7 +1363,7 @@ TEST_F(CookieMonsterTest, GetAllCookiesForURLPathMatching) {
ASSERT_TRUE(++it == cookies.end());
- cookies = GetAllCookiesForURL(cm.get(), url_google_bar_);
+ cookies = GetAllCookiesForURL(cm.get(), www_google_bar_.url());
it = cookies.begin();
ASSERT_TRUE(it != cookies.end());
@@ -1358,15 +1380,18 @@ TEST_F(CookieMonsterTest, GetAllCookiesForURLPathMatching) {
TEST_F(CookieMonsterTest, CookieSorting) {
scoped_refptr<CookieMonster> cm(new CookieMonster(NULL, NULL));
- EXPECT_TRUE(SetCookie(cm.get(), url_google_, "B=B1; path=/"));
- EXPECT_TRUE(SetCookie(cm.get(), url_google_, "B=B2; path=/foo"));
- EXPECT_TRUE(SetCookie(cm.get(), url_google_, "B=B3; path=/foo/bar"));
- EXPECT_TRUE(SetCookie(cm.get(), url_google_, "A=A1; path=/"));
- EXPECT_TRUE(SetCookie(cm.get(), url_google_, "A=A2; path=/foo"));
- EXPECT_TRUE(SetCookie(cm.get(), url_google_, "A=A3; path=/foo/bar"));
+ EXPECT_TRUE(SetCookie(cm.get(), http_www_google_.url(), "B=B1; path=/"));
+ EXPECT_TRUE(SetCookie(cm.get(), http_www_google_.url(), "B=B2; path=/foo"));
+ EXPECT_TRUE(
+ SetCookie(cm.get(), http_www_google_.url(), "B=B3; path=/foo/bar"));
+ EXPECT_TRUE(SetCookie(cm.get(), http_www_google_.url(), "A=A1; path=/"));
+ EXPECT_TRUE(SetCookie(cm.get(), http_www_google_.url(), "A=A2; path=/foo"));
+ EXPECT_TRUE(
+ SetCookie(cm.get(), http_www_google_.url(), "A=A3; path=/foo/bar"));
// Re-set cookie which should not change sort order.
- EXPECT_TRUE(SetCookie(cm.get(), url_google_, "B=B3; path=/foo/bar"));
+ EXPECT_TRUE(
+ SetCookie(cm.get(), http_www_google_.url(), "B=B3; path=/foo/bar"));
CookieList cookies = GetAllCookies(cm.get());
ASSERT_EQ(6u, cookies.size());
@@ -1385,14 +1410,14 @@ TEST_F(CookieMonsterTest, CookieSorting) {
TEST_F(CookieMonsterTest, DeleteCookieByName) {
scoped_refptr<CookieMonster> cm(new CookieMonster(NULL, NULL));
- EXPECT_TRUE(SetCookie(cm.get(), url_google_, "A=A1; path=/"));
- EXPECT_TRUE(SetCookie(cm.get(), url_google_, "A=A2; path=/foo"));
- EXPECT_TRUE(SetCookie(cm.get(), url_google_, "A=A3; path=/bar"));
- EXPECT_TRUE(SetCookie(cm.get(), url_google_, "B=B1; path=/"));
- EXPECT_TRUE(SetCookie(cm.get(), url_google_, "B=B2; path=/foo"));
- EXPECT_TRUE(SetCookie(cm.get(), url_google_, "B=B3; path=/bar"));
+ EXPECT_TRUE(SetCookie(cm.get(), http_www_google_.url(), "A=A1; path=/"));
+ EXPECT_TRUE(SetCookie(cm.get(), http_www_google_.url(), "A=A2; path=/foo"));
+ EXPECT_TRUE(SetCookie(cm.get(), http_www_google_.url(), "A=A3; path=/bar"));
+ EXPECT_TRUE(SetCookie(cm.get(), http_www_google_.url(), "B=B1; path=/"));
+ EXPECT_TRUE(SetCookie(cm.get(), http_www_google_.url(), "B=B2; path=/foo"));
+ EXPECT_TRUE(SetCookie(cm.get(), http_www_google_.url(), "B=B3; path=/bar"));
- DeleteCookie(cm.get(), GURL(std::string(kUrlGoogle) + "/foo/bar"), "A");
+ DeleteCookie(cm.get(), http_www_google_.AppendPath("foo/bar"), "A");
CookieList cookies = GetAllCookies(cm.get());
size_t expected_size = 4;
@@ -1407,11 +1432,12 @@ TEST_F(CookieMonsterTest, ImportCookiesFromCookieMonster) {
scoped_refptr<CookieMonster> cm_1(new CookieMonster(NULL, NULL));
CookieOptions options;
- EXPECT_TRUE(SetCookieWithOptions(cm_1.get(), url_google_foo_,
+ EXPECT_TRUE(SetCookieWithOptions(cm_1.get(), www_google_foo_.url(),
"A1=B; path=/foo;", options));
- EXPECT_TRUE(SetCookieWithOptions(cm_1.get(), url_google_bar_,
+ EXPECT_TRUE(SetCookieWithOptions(cm_1.get(), www_google_bar_.url(),
"A2=D; path=/bar;", options));
- EXPECT_TRUE(SetCookieWithOptions(cm_1.get(), url_google_, "A3=F;", options));
+ EXPECT_TRUE(SetCookieWithOptions(cm_1.get(), http_www_google_.url(), "A3=F;",
+ options));
CookieList cookies_1 = GetAllCookies(cm_1.get());
scoped_refptr<CookieMonster> cm_2(new CookieMonster(NULL, NULL));
@@ -1559,47 +1585,53 @@ TEST_F(CookieMonsterTest, CookieMonsterDelegate) {
scoped_refptr<CookieMonster> cm(
new CookieMonster(store.get(), delegate.get()));
- EXPECT_TRUE(SetCookie(cm.get(), url_google_, "A=B"));
- EXPECT_TRUE(SetCookie(cm.get(), url_google_, "C=D"));
- EXPECT_TRUE(SetCookie(cm.get(), url_google_, "E=F"));
- EXPECT_EQ("A=B; C=D; E=F", GetCookies(cm.get(), url_google_));
+ EXPECT_TRUE(SetCookie(cm.get(), http_www_google_.url(), "A=B"));
+ EXPECT_TRUE(SetCookie(cm.get(), http_www_google_.url(), "C=D"));
+ EXPECT_TRUE(SetCookie(cm.get(), http_www_google_.url(), "E=F"));
+ EXPECT_EQ("A=B; C=D; E=F", GetCookies(cm.get(), http_www_google_.url()));
ASSERT_EQ(3u, delegate->changes().size());
EXPECT_FALSE(delegate->changes()[0].second);
- EXPECT_EQ(url_google_.host(), delegate->changes()[0].first.Domain());
+ EXPECT_EQ(http_www_google_.url().host(),
+ delegate->changes()[0].first.Domain());
EXPECT_EQ("A", delegate->changes()[0].first.Name());
EXPECT_EQ("B", delegate->changes()[0].first.Value());
- EXPECT_EQ(url_google_.host(), delegate->changes()[1].first.Domain());
+ EXPECT_EQ(http_www_google_.url().host(),
+ delegate->changes()[1].first.Domain());
EXPECT_FALSE(delegate->changes()[1].second);
EXPECT_EQ("C", delegate->changes()[1].first.Name());
EXPECT_EQ("D", delegate->changes()[1].first.Value());
- EXPECT_EQ(url_google_.host(), delegate->changes()[2].first.Domain());
+ EXPECT_EQ(http_www_google_.url().host(),
+ delegate->changes()[2].first.Domain());
EXPECT_FALSE(delegate->changes()[2].second);
EXPECT_EQ("E", delegate->changes()[2].first.Name());
EXPECT_EQ("F", delegate->changes()[2].first.Value());
delegate->reset();
- EXPECT_TRUE(FindAndDeleteCookie(cm.get(), url_google_.host(), "C"));
- EXPECT_EQ("A=B; E=F", GetCookies(cm.get(), url_google_));
+ EXPECT_TRUE(
+ FindAndDeleteCookie(cm.get(), http_www_google_.url().host(), "C"));
+ EXPECT_EQ("A=B; E=F", GetCookies(cm.get(), http_www_google_.url()));
ASSERT_EQ(1u, delegate->changes().size());
- EXPECT_EQ(url_google_.host(), delegate->changes()[0].first.Domain());
+ EXPECT_EQ(http_www_google_.url().host(),
+ delegate->changes()[0].first.Domain());
EXPECT_TRUE(delegate->changes()[0].second);
EXPECT_EQ("C", delegate->changes()[0].first.Name());
EXPECT_EQ("D", delegate->changes()[0].first.Value());
delegate->reset();
EXPECT_FALSE(FindAndDeleteCookie(cm.get(), "random.host", "E"));
- EXPECT_EQ("A=B; E=F", GetCookies(cm.get(), url_google_));
+ EXPECT_EQ("A=B; E=F", GetCookies(cm.get(), http_www_google_.url()));
EXPECT_EQ(0u, delegate->changes().size());
// Insert a cookie "a" for path "/path1"
- EXPECT_TRUE(SetCookie(cm.get(), url_google_,
+ EXPECT_TRUE(SetCookie(cm.get(), http_www_google_.url(),
"a=val1; path=/path1; "
"expires=Mon, 18-Apr-22 22:50:13 GMT"));
ASSERT_EQ(1u, store->commands().size());
EXPECT_EQ(CookieStoreCommand::ADD, store->commands()[0].type);
ASSERT_EQ(1u, delegate->changes().size());
EXPECT_FALSE(delegate->changes()[0].second);
- EXPECT_EQ(url_google_.host(), delegate->changes()[0].first.Domain());
+ EXPECT_EQ(http_www_google_.url().host(),
+ delegate->changes()[0].first.Domain());
EXPECT_EQ("a", delegate->changes()[0].first.Name());
EXPECT_EQ("val1", delegate->changes()[0].first.Value());
delegate->reset();
@@ -1608,7 +1640,7 @@ TEST_F(CookieMonsterTest, CookieMonsterDelegate) {
// overwrite the non-http-only version.
CookieOptions allow_httponly;
allow_httponly.set_include_httponly();
- EXPECT_TRUE(SetCookieWithOptions(cm.get(), url_google_,
+ EXPECT_TRUE(SetCookieWithOptions(cm.get(), http_www_google_.url(),
"a=val2; path=/path1; httponly; "
"expires=Mon, 18-Apr-22 22:50:14 GMT",
allow_httponly));
@@ -1616,11 +1648,13 @@ TEST_F(CookieMonsterTest, CookieMonsterDelegate) {
EXPECT_EQ(CookieStoreCommand::REMOVE, store->commands()[1].type);
EXPECT_EQ(CookieStoreCommand::ADD, store->commands()[2].type);
ASSERT_EQ(2u, delegate->changes().size());
- EXPECT_EQ(url_google_.host(), delegate->changes()[0].first.Domain());
+ EXPECT_EQ(http_www_google_.url().host(),
+ delegate->changes()[0].first.Domain());
EXPECT_TRUE(delegate->changes()[0].second);
EXPECT_EQ("a", delegate->changes()[0].first.Name());
EXPECT_EQ("val1", delegate->changes()[0].first.Value());
- EXPECT_EQ(url_google_.host(), delegate->changes()[1].first.Domain());
+ EXPECT_EQ(http_www_google_.url().host(),
+ delegate->changes()[1].first.Domain());
EXPECT_FALSE(delegate->changes()[1].second);
EXPECT_EQ("a", delegate->changes()[1].first.Name());
EXPECT_EQ("val2", delegate->changes()[1].first.Value());
@@ -1630,40 +1664,40 @@ TEST_F(CookieMonsterTest, CookieMonsterDelegate) {
TEST_F(CookieMonsterTest, SetCookieWithDetails) {
scoped_refptr<CookieMonster> cm(new CookieMonster(NULL, NULL));
- EXPECT_TRUE(SetCookieWithDetails(cm.get(), url_google_foo_, "A", "B",
+ EXPECT_TRUE(SetCookieWithDetails(cm.get(), www_google_foo_.url(), "A", "B",
std::string(), "/foo", base::Time(), false,
false, false, COOKIE_PRIORITY_DEFAULT));
- EXPECT_TRUE(SetCookieWithDetails(cm.get(), url_google_bar_, "C", "D",
- "google.izzle", "/bar", base::Time(), false,
- true, false, COOKIE_PRIORITY_DEFAULT));
EXPECT_TRUE(SetCookieWithDetails(
- cm.get(), url_google_, "E", "F", std::string(), std::string(),
+ cm.get(), www_google_bar_.url(), "C", "D", www_google_bar_.domain(),
+ "/bar", base::Time(), false, true, false, COOKIE_PRIORITY_DEFAULT));
+ EXPECT_TRUE(SetCookieWithDetails(
+ cm.get(), http_www_google_.url(), "E", "F", std::string(), std::string(),
base::Time(), true, false, false, COOKIE_PRIORITY_DEFAULT));
// Test that malformed attributes fail to set the cookie.
- EXPECT_FALSE(SetCookieWithDetails(cm.get(), url_google_foo_, " A", "B",
+ EXPECT_FALSE(SetCookieWithDetails(cm.get(), www_google_foo_.url(), " A", "B",
std::string(), "/foo", base::Time(), false,
false, false, COOKIE_PRIORITY_DEFAULT));
- EXPECT_FALSE(SetCookieWithDetails(cm.get(), url_google_foo_, "A;", "B",
+ EXPECT_FALSE(SetCookieWithDetails(cm.get(), www_google_foo_.url(), "A;", "B",
std::string(), "/foo", base::Time(), false,
false, false, COOKIE_PRIORITY_DEFAULT));
- EXPECT_FALSE(SetCookieWithDetails(cm.get(), url_google_foo_, "A=", "B",
+ EXPECT_FALSE(SetCookieWithDetails(cm.get(), www_google_foo_.url(), "A=", "B",
std::string(), "/foo", base::Time(), false,
false, false, COOKIE_PRIORITY_DEFAULT));
EXPECT_FALSE(SetCookieWithDetails(
- cm.get(), url_google_foo_, "A", "B", "google.ozzzzzzle", "foo",
+ cm.get(), www_google_foo_.url(), "A", "B", "google.ozzzzzzle", "foo",
base::Time(), false, false, false, COOKIE_PRIORITY_DEFAULT));
- EXPECT_FALSE(SetCookieWithDetails(cm.get(), url_google_foo_, "A=", "B",
+ EXPECT_FALSE(SetCookieWithDetails(cm.get(), www_google_foo_.url(), "A=", "B",
std::string(), "foo", base::Time(), false,
false, false, COOKIE_PRIORITY_DEFAULT));
- CookieList cookies = GetAllCookiesForURL(cm.get(), url_google_foo_);
+ CookieList cookies = GetAllCookiesForURL(cm.get(), www_google_foo_.url());
CookieList::iterator it = cookies.begin();
ASSERT_TRUE(it != cookies.end());
EXPECT_EQ("A", it->Name());
EXPECT_EQ("B", it->Value());
- EXPECT_EQ("www.google.izzle", it->Domain());
+ EXPECT_EQ(www_google_foo_.host(), it->Domain());
EXPECT_EQ("/foo", it->Path());
EXPECT_FALSE(it->IsPersistent());
EXPECT_FALSE(it->IsSecure());
@@ -1671,27 +1705,27 @@ TEST_F(CookieMonsterTest, SetCookieWithDetails) {
ASSERT_TRUE(++it == cookies.end());
- cookies = GetAllCookiesForURL(cm.get(), url_google_bar_);
+ cookies = GetAllCookiesForURL(cm.get(), www_google_bar_.url());
it = cookies.begin();
ASSERT_TRUE(it != cookies.end());
EXPECT_EQ("C", it->Name());
EXPECT_EQ("D", it->Value());
- EXPECT_EQ(".google.izzle", it->Domain());
+ EXPECT_EQ(www_google_bar_.Format(".%D"), it->Domain());
EXPECT_EQ("/bar", it->Path());
EXPECT_FALSE(it->IsSecure());
EXPECT_TRUE(it->IsHttpOnly());
ASSERT_TRUE(++it == cookies.end());
- cookies = GetAllCookiesForURL(cm.get(), url_google_secure_);
+ cookies = GetAllCookiesForURL(cm.get(), https_www_google_.url());
it = cookies.begin();
ASSERT_TRUE(it != cookies.end());
EXPECT_EQ("E", it->Name());
EXPECT_EQ("F", it->Value());
EXPECT_EQ("/", it->Path());
- EXPECT_EQ("www.google.izzle", it->Domain());
+ EXPECT_EQ(https_www_google_.host(), it->Domain());
EXPECT_TRUE(it->IsSecure());
EXPECT_FALSE(it->IsHttpOnly());
@@ -1779,26 +1813,29 @@ TEST_F(CookieMonsterTest, UniqueCreationTime) {
// SetCookie, SetCookieWithOptions, SetCookieWithDetails
- EXPECT_TRUE(SetCookie(cm.get(), url_google_, "SetCookie1=A"));
- EXPECT_TRUE(SetCookie(cm.get(), url_google_, "SetCookie2=A"));
- EXPECT_TRUE(SetCookie(cm.get(), url_google_, "SetCookie3=A"));
+ EXPECT_TRUE(SetCookie(cm.get(), http_www_google_.url(), "SetCookie1=A"));
+ EXPECT_TRUE(SetCookie(cm.get(), http_www_google_.url(), "SetCookie2=A"));
+ EXPECT_TRUE(SetCookie(cm.get(), http_www_google_.url(), "SetCookie3=A"));
- EXPECT_TRUE(SetCookieWithOptions(cm.get(), url_google_,
+ EXPECT_TRUE(SetCookieWithOptions(cm.get(), http_www_google_.url(),
"setCookieWithOptions1=A", options));
- EXPECT_TRUE(SetCookieWithOptions(cm.get(), url_google_,
+ EXPECT_TRUE(SetCookieWithOptions(cm.get(), http_www_google_.url(),
"setCookieWithOptions2=A", options));
- EXPECT_TRUE(SetCookieWithOptions(cm.get(), url_google_,
+ EXPECT_TRUE(SetCookieWithOptions(cm.get(), http_www_google_.url(),
"setCookieWithOptions3=A", options));
EXPECT_TRUE(SetCookieWithDetails(
- cm.get(), url_google_, "setCookieWithDetails1", "A", ".google.izzle", "/",
- Time(), false, false, false, COOKIE_PRIORITY_DEFAULT));
+ cm.get(), http_www_google_.url(), "setCookieWithDetails1", "A",
+ http_www_google_.Format(".%D"), "/", Time(), false, false, false,
+ COOKIE_PRIORITY_DEFAULT));
EXPECT_TRUE(SetCookieWithDetails(
- cm.get(), url_google_, "setCookieWithDetails2", "A", ".google.izzle", "/",
- Time(), false, false, false, COOKIE_PRIORITY_DEFAULT));
+ cm.get(), http_www_google_.url(), "setCookieWithDetails2", "A",
+ http_www_google_.Format(".%D"), "/", Time(), false, false, false,
+ COOKIE_PRIORITY_DEFAULT));
EXPECT_TRUE(SetCookieWithDetails(
- cm.get(), url_google_, "setCookieWithDetails3", "A", ".google.izzle", "/",
- Time(), false, false, false, COOKIE_PRIORITY_DEFAULT));
+ cm.get(), http_www_google_.url(), "setCookieWithDetails3", "A",
+ http_www_google_.Format(".%D"), "/", Time(), false, false, false,
+ COOKIE_PRIORITY_DEFAULT));
// Now we check
CookieList cookie_list(GetAllCookies(cm.get()));
@@ -2059,7 +2096,7 @@ TEST_F(CookieMonsterTest, KeepExpiredCookies) {
// Set a persistent cookie.
ASSERT_TRUE(SetCookieWithOptions(
- cm.get(), url_google_,
+ cm.get(), http_www_google_.url(),
std::string(kValidCookieLine) + "; expires=Mon, 18-Apr-22 22:50:13 GMT",
options));
@@ -2069,7 +2106,7 @@ TEST_F(CookieMonsterTest, KeepExpiredCookies) {
// Use a past expiry date to delete the cookie.
ASSERT_TRUE(SetCookieWithOptions(
- cm.get(), url_google_,
+ cm.get(), http_www_google_.url(),
std::string(kValidCookieLine) + "; expires=Mon, 18-Apr-1977 22:50:13 GMT",
options));
@@ -2194,19 +2231,21 @@ TEST_F(CookieMonsterTest, SetAllCookies) {
scoped_refptr<CookieMonster> cm(new CookieMonster(store.get(), NULL));
cm->SetPersistSessionCookies(true);
- EXPECT_TRUE(SetCookie(cm.get(), url_google_, "U=V; path=/"));
- EXPECT_TRUE(SetCookie(cm.get(), url_google_, "W=X; path=/foo"));
- EXPECT_TRUE(SetCookie(cm.get(), url_google_, "Y=Z; path=/"));
+ EXPECT_TRUE(SetCookie(cm.get(), http_www_google_.url(), "U=V; path=/"));
+ EXPECT_TRUE(SetCookie(cm.get(), http_www_google_.url(), "W=X; path=/foo"));
+ EXPECT_TRUE(SetCookie(cm.get(), http_www_google_.url(), "Y=Z; path=/"));
CookieList list;
- list.push_back(CanonicalCookie(url_google_, "A", "B", url_google_.host(), "/",
+ list.push_back(CanonicalCookie(http_www_google_.url(), "A", "B",
+ http_www_google_.url().host(), "/",
base::Time::Now(), base::Time(), base::Time(),
false, false, false, COOKIE_PRIORITY_DEFAULT));
- list.push_back(CanonicalCookie(url_google_, "W", "X", url_google_.host(),
- "/bar", base::Time::Now(), base::Time(),
- base::Time(), false, false, false,
- COOKIE_PRIORITY_DEFAULT));
- list.push_back(CanonicalCookie(url_google_, "Y", "Z", url_google_.host(), "/",
+ list.push_back(CanonicalCookie(http_www_google_.url(), "W", "X",
+ http_www_google_.url().host(), "/bar",
+ base::Time::Now(), base::Time(), base::Time(),
+ false, false, false, COOKIE_PRIORITY_DEFAULT));
+ list.push_back(CanonicalCookie(http_www_google_.url(), "Y", "Z",
+ http_www_google_.url().host(), "/",
base::Time::Now(), base::Time(), base::Time(),
false, false, false, COOKIE_PRIORITY_DEFAULT));
@@ -2240,39 +2279,49 @@ TEST_F(CookieMonsterTest, ComputeCookieDiff) {
base::Time now = base::Time::Now();
base::Time creation_time = now - base::TimeDelta::FromSeconds(1);
- CanonicalCookie cookie1(url_google_, "A", "B", url_google_.host(), "/",
- creation_time, base::Time(), base::Time(), false,
- false, false, COOKIE_PRIORITY_DEFAULT);
- CanonicalCookie cookie2(url_google_, "C", "D", url_google_.host(), "/",
- creation_time, base::Time(), base::Time(), false,
- false, false, COOKIE_PRIORITY_DEFAULT);
- CanonicalCookie cookie3(url_google_, "E", "F", url_google_.host(), "/",
- creation_time, base::Time(), base::Time(), false,
- false, false, COOKIE_PRIORITY_DEFAULT);
- CanonicalCookie cookie4(url_google_, "G", "H", url_google_.host(), "/",
- creation_time, base::Time(), base::Time(), false,
- false, false, COOKIE_PRIORITY_DEFAULT);
+ CanonicalCookie cookie1(http_www_google_.url(), "A", "B",
+ http_www_google_.url().host(), "/", creation_time,
+ base::Time(), base::Time(), false, false, false,
+ COOKIE_PRIORITY_DEFAULT);
+ CanonicalCookie cookie2(http_www_google_.url(), "C", "D",
+ http_www_google_.url().host(), "/", creation_time,
+ base::Time(), base::Time(), false, false, false,
+ COOKIE_PRIORITY_DEFAULT);
+ CanonicalCookie cookie3(http_www_google_.url(), "E", "F",
+ http_www_google_.url().host(), "/", creation_time,
+ base::Time(), base::Time(), false, false, false,
+ COOKIE_PRIORITY_DEFAULT);
+ CanonicalCookie cookie4(http_www_google_.url(), "G", "H",
+ http_www_google_.url().host(), "/", creation_time,
+ base::Time(), base::Time(), false, false, false,
+ COOKIE_PRIORITY_DEFAULT);
CanonicalCookie cookie4_with_new_value(
- url_google_, "G", "iamnew", url_google_.host(), "/", creation_time,
- base::Time(), base::Time(), false, false, false, COOKIE_PRIORITY_DEFAULT);
- CanonicalCookie cookie5(url_google_, "I", "J", url_google_.host(), "/",
- creation_time, base::Time(), base::Time(), false,
- false, false, COOKIE_PRIORITY_DEFAULT);
+ http_www_google_.url(), "G", "iamnew", http_www_google_.url().host(), "/",
+ creation_time, base::Time(), base::Time(), false, false, false,
+ COOKIE_PRIORITY_DEFAULT);
+ CanonicalCookie cookie5(http_www_google_.url(), "I", "J",
+ http_www_google_.url().host(), "/", creation_time,
+ base::Time(), base::Time(), false, false, false,
+ COOKIE_PRIORITY_DEFAULT);
CanonicalCookie cookie5_with_new_creation_time(
- url_google_, "I", "J", url_google_.host(), "/", now, base::Time(),
- base::Time(), false, false, false, COOKIE_PRIORITY_DEFAULT);
- CanonicalCookie cookie6(url_google_, "K", "L", url_google_.host(), "/foo",
- creation_time, base::Time(), base::Time(), false,
- false, false, COOKIE_PRIORITY_DEFAULT);
- CanonicalCookie cookie6_with_new_path(
- url_google_, "K", "L", url_google_.host(), "/bar", creation_time,
+ http_www_google_.url(), "I", "J", http_www_google_.url().host(), "/", now,
base::Time(), base::Time(), false, false, false, COOKIE_PRIORITY_DEFAULT);
- CanonicalCookie cookie7(url_google_, "M", "N", url_google_.host(), "/foo",
- creation_time, base::Time(), base::Time(), false,
- false, false, COOKIE_PRIORITY_DEFAULT);
+ CanonicalCookie cookie6(http_www_google_.url(), "K", "L",
+ http_www_google_.url().host(), "/foo", creation_time,
+ base::Time(), base::Time(), false, false, false,
+ COOKIE_PRIORITY_DEFAULT);
+ CanonicalCookie cookie6_with_new_path(
+ http_www_google_.url(), "K", "L", http_www_google_.url().host(), "/bar",
+ creation_time, base::Time(), base::Time(), false, false, false,
+ COOKIE_PRIORITY_DEFAULT);
+ CanonicalCookie cookie7(http_www_google_.url(), "M", "N",
+ http_www_google_.url().host(), "/foo", creation_time,
+ base::Time(), base::Time(), false, false, false,
+ COOKIE_PRIORITY_DEFAULT);
CanonicalCookie cookie7_with_new_path(
- url_google_, "M", "N", url_google_.host(), "/bar", creation_time,
- base::Time(), base::Time(), false, false, false, COOKIE_PRIORITY_DEFAULT);
+ http_www_google_.url(), "M", "N", http_www_google_.url().host(), "/bar",
+ creation_time, base::Time(), base::Time(), false, false, false,
+ COOKIE_PRIORITY_DEFAULT);
CookieList old_cookies;
old_cookies.push_back(cookie1);
@@ -2345,7 +2394,7 @@ TEST_F(CookieMonsterTest, DeleteAll) {
scoped_refptr<CookieMonster> cm(new CookieMonster(store.get(), NULL));
cm->SetPersistSessionCookies(true);
- EXPECT_TRUE(SetCookie(cm.get(), url_google_, "X=Y; path=/"));
+ EXPECT_TRUE(SetCookie(cm.get(), http_www_google_.url(), "X=Y; path=/"));
ASSERT_EQ(0, store->flush_count());
EXPECT_EQ(1, DeleteAll(cm.get()));
@@ -2373,7 +2422,7 @@ TEST_F(CookieMonsterTest, HistogramCheck) {
EXPECT_EQ(samples1->TotalCount() + 1, samples2->TotalCount());
// kValidCookieLine creates a session cookie.
- ASSERT_TRUE(SetCookie(cm.get(), url_google_, kValidCookieLine));
+ ASSERT_TRUE(SetCookie(cm.get(), http_www_google_.url(), kValidCookieLine));
scoped_ptr<base::HistogramSamples> samples3(
expired_histogram->SnapshotSamples());
@@ -2484,11 +2533,11 @@ class MultiThreadedCookieMonsterTest : public CookieMonsterTest {
TEST_F(MultiThreadedCookieMonsterTest, ThreadCheckGetAllCookies) {
scoped_refptr<CookieMonster> cm(new CookieMonster(NULL, NULL));
- EXPECT_TRUE(SetCookie(cm.get(), url_google_, "A=B"));
+ EXPECT_TRUE(SetCookie(cm.get(), http_www_google_.url(), "A=B"));
CookieList cookies = GetAllCookies(cm.get());
CookieList::const_iterator it = cookies.begin();
ASSERT_TRUE(it != cookies.end());
- EXPECT_EQ("www.google.izzle", it->Domain());
+ EXPECT_EQ(http_www_google_.host(), it->Domain());
EXPECT_EQ("A", it->Name());
ASSERT_TRUE(++it == cookies.end());
GetCookieListCallback callback(&other_thread_);
@@ -2499,66 +2548,66 @@ TEST_F(MultiThreadedCookieMonsterTest, ThreadCheckGetAllCookies) {
EXPECT_TRUE(callback.did_run());
it = callback.cookies().begin();
ASSERT_TRUE(it != callback.cookies().end());
- EXPECT_EQ("www.google.izzle", it->Domain());
+ EXPECT_EQ(http_www_google_.host(), it->Domain());
EXPECT_EQ("A", it->Name());
ASSERT_TRUE(++it == callback.cookies().end());
}
TEST_F(MultiThreadedCookieMonsterTest, ThreadCheckGetAllCookiesForURL) {
scoped_refptr<CookieMonster> cm(new CookieMonster(NULL, NULL));
- EXPECT_TRUE(SetCookie(cm.get(), url_google_, "A=B"));
- CookieList cookies = GetAllCookiesForURL(cm.get(), url_google_);
+ EXPECT_TRUE(SetCookie(cm.get(), http_www_google_.url(), "A=B"));
+ CookieList cookies = GetAllCookiesForURL(cm.get(), http_www_google_.url());
CookieList::const_iterator it = cookies.begin();
ASSERT_TRUE(it != cookies.end());
- EXPECT_EQ("www.google.izzle", it->Domain());
+ EXPECT_EQ(http_www_google_.host(), it->Domain());
EXPECT_EQ("A", it->Name());
ASSERT_TRUE(++it == cookies.end());
GetCookieListCallback callback(&other_thread_);
base::Closure task =
base::Bind(&MultiThreadedCookieMonsterTest::GetAllCookiesForURLTask,
- base::Unretained(this), cm, url_google_, &callback);
+ base::Unretained(this), cm, http_www_google_.url(), &callback);
RunOnOtherThread(task);
EXPECT_TRUE(callback.did_run());
it = callback.cookies().begin();
ASSERT_TRUE(it != callback.cookies().end());
- EXPECT_EQ("www.google.izzle", it->Domain());
+ EXPECT_EQ(http_www_google_.host(), it->Domain());
EXPECT_EQ("A", it->Name());
ASSERT_TRUE(++it == callback.cookies().end());
}
TEST_F(MultiThreadedCookieMonsterTest, ThreadCheckGetAllCookiesForURLWithOpt) {
scoped_refptr<CookieMonster> cm(new CookieMonster(NULL, NULL));
- EXPECT_TRUE(SetCookie(cm.get(), url_google_, "A=B"));
+ EXPECT_TRUE(SetCookie(cm.get(), http_www_google_.url(), "A=B"));
CookieOptions options;
CookieList cookies =
- GetAllCookiesForURLWithOptions(cm.get(), url_google_, options);
+ GetAllCookiesForURLWithOptions(cm.get(), http_www_google_.url(), options);
CookieList::const_iterator it = cookies.begin();
ASSERT_TRUE(it != cookies.end());
- EXPECT_EQ("www.google.izzle", it->Domain());
+ EXPECT_EQ(http_www_google_.host(), it->Domain());
EXPECT_EQ("A", it->Name());
ASSERT_TRUE(++it == cookies.end());
GetCookieListCallback callback(&other_thread_);
base::Closure task = base::Bind(
&MultiThreadedCookieMonsterTest::GetAllCookiesForURLWithOptionsTask,
- base::Unretained(this), cm, url_google_, options, &callback);
+ base::Unretained(this), cm, http_www_google_.url(), options, &callback);
RunOnOtherThread(task);
EXPECT_TRUE(callback.did_run());
it = callback.cookies().begin();
ASSERT_TRUE(it != callback.cookies().end());
- EXPECT_EQ("www.google.izzle", it->Domain());
+ EXPECT_EQ(http_www_google_.host(), it->Domain());
EXPECT_EQ("A", it->Name());
ASSERT_TRUE(++it == callback.cookies().end());
}
TEST_F(MultiThreadedCookieMonsterTest, ThreadCheckSetCookieWithDetails) {
scoped_refptr<CookieMonster> cm(new CookieMonster(NULL, NULL));
- EXPECT_TRUE(SetCookieWithDetails(cm.get(), url_google_foo_, "A", "B",
+ EXPECT_TRUE(SetCookieWithDetails(cm.get(), www_google_foo_.url(), "A", "B",
std::string(), "/foo", base::Time(), false,
false, false, COOKIE_PRIORITY_DEFAULT));
ResultSavingCookieCallback<bool> callback(&other_thread_);
base::Closure task =
base::Bind(&MultiThreadedCookieMonsterTest::SetCookieWithDetailsTask,
- base::Unretained(this), cm, url_google_foo_, &callback);
+ base::Unretained(this), cm, www_google_foo_.url(), &callback);
RunOnOtherThread(task);
EXPECT_TRUE(callback.did_run());
EXPECT_TRUE(callback.result());
@@ -2568,10 +2617,12 @@ TEST_F(MultiThreadedCookieMonsterTest, ThreadCheckDeleteAllCreatedBetween) {
scoped_refptr<CookieMonster> cm(new CookieMonster(NULL, NULL));
CookieOptions options;
Time now = Time::Now();
- EXPECT_TRUE(SetCookieWithOptions(cm.get(), url_google_, "A=B", options));
+ EXPECT_TRUE(
+ SetCookieWithOptions(cm.get(), http_www_google_.url(), "A=B", options));
EXPECT_EQ(1, DeleteAllCreatedBetween(cm.get(), now - TimeDelta::FromDays(99),
Time()));
- EXPECT_TRUE(SetCookieWithOptions(cm.get(), url_google_, "A=B", options));
+ EXPECT_TRUE(
+ SetCookieWithOptions(cm.get(), http_www_google_.url(), "A=B", options));
ResultSavingCookieCallback<int> callback(&other_thread_);
base::Closure task =
base::Bind(&MultiThreadedCookieMonsterTest::DeleteAllCreatedBetweenTask,
@@ -2585,13 +2636,15 @@ TEST_F(MultiThreadedCookieMonsterTest, ThreadCheckDeleteAllCreatedBetween) {
TEST_F(MultiThreadedCookieMonsterTest, ThreadCheckDeleteAllForHost) {
scoped_refptr<CookieMonster> cm(new CookieMonster(NULL, NULL));
CookieOptions options;
- EXPECT_TRUE(SetCookieWithOptions(cm.get(), url_google_, "A=B", options));
- EXPECT_EQ(1, DeleteAllForHost(cm.get(), url_google_));
- EXPECT_TRUE(SetCookieWithOptions(cm.get(), url_google_, "A=B", options));
+ EXPECT_TRUE(
+ SetCookieWithOptions(cm.get(), http_www_google_.url(), "A=B", options));
+ EXPECT_EQ(1, DeleteAllForHost(cm.get(), http_www_google_.url()));
+ EXPECT_TRUE(
+ SetCookieWithOptions(cm.get(), http_www_google_.url(), "A=B", options));
ResultSavingCookieCallback<int> callback(&other_thread_);
base::Closure task =
base::Bind(&MultiThreadedCookieMonsterTest::DeleteAllForHostTask,
- base::Unretained(this), cm, url_google_, &callback);
+ base::Unretained(this), cm, http_www_google_.url(), &callback);
RunOnOtherThread(task);
EXPECT_TRUE(callback.did_run());
EXPECT_EQ(1, callback.result());
@@ -2610,29 +2663,35 @@ TEST_F(MultiThreadedCookieMonsterTest,
Time ago3 = now - TimeDelta::FromDays(99);
// These 3 cookies match the first deletion.
- EXPECT_TRUE(SetCookieWithOptions(cm.get(), url_google_, "A=B", options));
- EXPECT_TRUE(SetCookieWithOptions(cm.get(), url_google_, "C=D", options));
- EXPECT_TRUE(SetCookieWithOptions(cm.get(), url_google_, "Y=Z", options));
+ EXPECT_TRUE(
+ SetCookieWithOptions(cm.get(), http_www_google_.url(), "A=B", options));
+ EXPECT_TRUE(
+ SetCookieWithOptions(cm.get(), http_www_google_.url(), "C=D", options));
+ EXPECT_TRUE(
+ SetCookieWithOptions(cm.get(), http_www_google_.url(), "Y=Z", options));
// This cookie does not match host.
EXPECT_TRUE(SetCookieWithOptions(cm.get(), url_not_google, "E=F", options));
// This cookie does not match time range: [ago3, inf], for first deletion, but
// matches for the second deletion.
- EXPECT_TRUE(cm->SetCookieWithCreationTime(url_google_, "G=H", ago2));
+ EXPECT_TRUE(
+ cm->SetCookieWithCreationTime(http_www_google_.url(), "G=H", ago2));
// 1. First set of deletions.
- EXPECT_EQ(
- 3, // Deletes A=B, C=D, Y=Z
- DeleteAllCreatedBetweenForHost(cm.get(), ago3, Time::Max(), url_google_));
+ EXPECT_EQ(3, // Deletes A=B, C=D, Y=Z
+ DeleteAllCreatedBetweenForHost(cm.get(), ago3, Time::Max(),
+ http_www_google_.url()));
- EXPECT_TRUE(SetCookieWithOptions(cm.get(), url_google_, "A=B", options));
+ EXPECT_TRUE(
+ SetCookieWithOptions(cm.get(), http_www_google_.url(), "A=B", options));
ResultSavingCookieCallback<int> callback(&other_thread_);
// 2. Second set of deletions.
base::Closure task = base::Bind(
&MultiThreadedCookieMonsterTest::DeleteAllCreatedBetweenForHostTask,
- base::Unretained(this), cm, ago1, Time(), url_google_, &callback);
+ base::Unretained(this), cm, ago1, Time(), http_www_google_.url(),
+ &callback);
RunOnOtherThread(task);
EXPECT_TRUE(callback.did_run());
EXPECT_EQ(2, callback.result()); // Deletes A=B, G=H.
@@ -2641,12 +2700,14 @@ TEST_F(MultiThreadedCookieMonsterTest,
TEST_F(MultiThreadedCookieMonsterTest, ThreadCheckDeleteCanonicalCookie) {
scoped_refptr<CookieMonster> cm(new CookieMonster(NULL, NULL));
CookieOptions options;
- EXPECT_TRUE(SetCookieWithOptions(cm.get(), url_google_, "A=B", options));
+ EXPECT_TRUE(
+ SetCookieWithOptions(cm.get(), http_www_google_.url(), "A=B", options));
CookieList cookies = GetAllCookies(cm.get());
CookieList::iterator it = cookies.begin();
EXPECT_TRUE(DeleteCanonicalCookie(cm.get(), *it));
- EXPECT_TRUE(SetCookieWithOptions(cm.get(), url_google_, "A=B", options));
+ EXPECT_TRUE(
+ SetCookieWithOptions(cm.get(), http_www_google_.url(), "A=B", options));
ResultSavingCookieCallback<bool> callback(&other_thread_);
cookies = GetAllCookies(cm.get());
it = cookies.begin();
@@ -2665,8 +2726,8 @@ TEST_F(MultiThreadedCookieMonsterTest, ThreadCheckDeleteCanonicalCookie) {
TEST_F(MultiThreadedCookieMonsterTest, GetAllCookiesForURLEffectiveDomain) {
std::vector<CanonicalCookie*> cookies;
// This cookie will be freed by the CookieMonster.
- cookies.push_back(CanonicalCookie::Create(url_google_, kValidCookieLine,
- Time::Now(), CookieOptions()));
+ cookies.push_back(CanonicalCookie::Create(
+ http_www_google_.url(), kValidCookieLine, Time::Now(), CookieOptions()));
CanonicalCookie cookie = *cookies[0];
scoped_refptr<NewMockPersistentCookieStore> store(
new NewMockPersistentCookieStore);
@@ -2674,8 +2735,8 @@ TEST_F(MultiThreadedCookieMonsterTest, GetAllCookiesForURLEffectiveDomain) {
CookieMonster::PersistentCookieStore::LoadedCallback loaded_callback;
::testing::StrictMock<::testing::MockFunction<void(int)>> checkpoint;
- const std::string key =
- cookie_util::GetEffectiveDomain(url_google_.scheme(), url_google_.host());
+ const std::string key = cookie_util::GetEffectiveDomain(
+ http_www_google_.url().scheme(), http_www_google_.url().host());
::testing::InSequence s;
EXPECT_CALL(checkpoint, Call(0));
@@ -2690,7 +2751,7 @@ TEST_F(MultiThreadedCookieMonsterTest, GetAllCookiesForURLEffectiveDomain) {
GetCookieListCallback callback;
checkpoint.Call(0);
- GetAllCookiesForURLTask(cm.get(), url_google_, &callback);
+ GetAllCookiesForURLTask(cm.get(), http_www_google_.url(), &callback);
checkpoint.Call(1);
ASSERT_FALSE(callback.did_run());
// Pass the cookies to the CookieMonster.
@@ -2703,10 +2764,8 @@ TEST_F(MultiThreadedCookieMonsterTest, GetAllCookiesForURLEffectiveDomain) {
// All urls in |urls| should share the same cookie domain.
const GURL kUrls[] = {
- url_google_,
- url_google_secure_,
- GURL(kUrlGoogleWebSocket),
- GURL(kUrlGoogleWebSocketSecure),
+ http_www_google_.url(), https_www_google_.url(), ws_www_google_.url(),
+ wss_www_google_.url(),
};
for (const GURL& url : kUrls) {
// Call the function with |url| and verify it is done synchronously without
@@ -2723,7 +2782,7 @@ TEST_F(CookieMonsterTest, InvalidExpiryTime) {
std::string cookie_line =
std::string(kValidCookieLine) + "; expires=Blarg arg arg";
scoped_ptr<CanonicalCookie> cookie(CanonicalCookie::Create(
- url_google_, cookie_line, Time::Now(), CookieOptions()));
+ http_www_google_.url(), cookie_line, Time::Now(), CookieOptions()));
ASSERT_FALSE(cookie->IsPersistent());
}
@@ -2735,8 +2794,8 @@ TEST_F(CookieMonsterTest, PersistSessionCookies) {
cm->SetPersistSessionCookies(true);
// All cookies set with SetCookie are session cookies.
- EXPECT_TRUE(SetCookie(cm.get(), url_google_, "A=B"));
- EXPECT_EQ("A=B", GetCookies(cm.get(), url_google_));
+ EXPECT_TRUE(SetCookie(cm.get(), http_www_google_.url(), "A=B"));
+ EXPECT_EQ("A=B", GetCookies(cm.get(), http_www_google_.url()));
// The cookie was written to the backing store.
EXPECT_EQ(1u, store->commands().size());
@@ -2745,8 +2804,8 @@ TEST_F(CookieMonsterTest, PersistSessionCookies) {
EXPECT_EQ("B", store->commands()[0].cookie.Value());
// Modify the cookie.
- EXPECT_TRUE(SetCookie(cm.get(), url_google_, "A=C"));
- EXPECT_EQ("A=C", GetCookies(cm.get(), url_google_));
+ EXPECT_TRUE(SetCookie(cm.get(), http_www_google_.url(), "A=C"));
+ EXPECT_EQ("A=C", GetCookies(cm.get(), http_www_google_.url()));
EXPECT_EQ(3u, store->commands().size());
EXPECT_EQ(CookieStoreCommand::REMOVE, store->commands()[1].type);
EXPECT_EQ("A", store->commands()[1].cookie.Name());
@@ -2756,8 +2815,8 @@ TEST_F(CookieMonsterTest, PersistSessionCookies) {
EXPECT_EQ("C", store->commands()[2].cookie.Value());
// Delete the cookie.
- DeleteCookie(cm.get(), url_google_, "A");
- EXPECT_EQ("", GetCookies(cm.get(), url_google_));
+ DeleteCookie(cm.get(), http_www_google_.url(), "A");
+ EXPECT_EQ("", GetCookies(cm.get(), http_www_google_.url()));
EXPECT_EQ(4u, store->commands().size());
EXPECT_EQ(CookieStoreCommand::REMOVE, store->commands()[3].type);
EXPECT_EQ("A", store->commands()[3].cookie.Name());
@@ -2770,35 +2829,37 @@ TEST_F(CookieMonsterTest, PersisentCookieStorageTest) {
scoped_refptr<CookieMonster> cm(new CookieMonster(store.get(), NULL));
// Add a cookie.
- EXPECT_TRUE(SetCookie(cm.get(), url_google_,
+ EXPECT_TRUE(SetCookie(cm.get(), http_www_google_.url(),
"A=B; expires=Mon, 18-Apr-22 22:50:13 GMT"));
- this->MatchCookieLines("A=B", GetCookies(cm.get(), url_google_));
+ this->MatchCookieLines("A=B", GetCookies(cm.get(), http_www_google_.url()));
ASSERT_EQ(1u, store->commands().size());
EXPECT_EQ(CookieStoreCommand::ADD, store->commands()[0].type);
// Remove it.
- EXPECT_TRUE(SetCookie(cm.get(), url_google_, "A=B; max-age=0"));
- this->MatchCookieLines(std::string(), GetCookies(cm.get(), url_google_));
+ EXPECT_TRUE(SetCookie(cm.get(), http_www_google_.url(), "A=B; max-age=0"));
+ this->MatchCookieLines(std::string(),
+ GetCookies(cm.get(), http_www_google_.url()));
ASSERT_EQ(2u, store->commands().size());
EXPECT_EQ(CookieStoreCommand::REMOVE, store->commands()[1].type);
// Add a cookie.
- EXPECT_TRUE(SetCookie(cm.get(), url_google_,
+ EXPECT_TRUE(SetCookie(cm.get(), http_www_google_.url(),
"A=B; expires=Mon, 18-Apr-22 22:50:13 GMT"));
- this->MatchCookieLines("A=B", GetCookies(cm.get(), url_google_));
+ this->MatchCookieLines("A=B", GetCookies(cm.get(), http_www_google_.url()));
ASSERT_EQ(3u, store->commands().size());
EXPECT_EQ(CookieStoreCommand::ADD, store->commands()[2].type);
// Overwrite it.
- EXPECT_TRUE(SetCookie(cm.get(), url_google_,
+ EXPECT_TRUE(SetCookie(cm.get(), http_www_google_.url(),
"A=Foo; expires=Mon, 18-Apr-22 22:50:14 GMT"));
- this->MatchCookieLines("A=Foo", GetCookies(cm.get(), url_google_));
+ this->MatchCookieLines("A=Foo", GetCookies(cm.get(), http_www_google_.url()));
ASSERT_EQ(5u, store->commands().size());
EXPECT_EQ(CookieStoreCommand::REMOVE, store->commands()[3].type);
EXPECT_EQ(CookieStoreCommand::ADD, store->commands()[4].type);
// Create some non-persistent cookies and check that they don't go to the
// persistent storage.
- EXPECT_TRUE(SetCookie(cm.get(), url_google_, "B=Bar"));
- this->MatchCookieLines("A=Foo; B=Bar", GetCookies(cm.get(), url_google_));
+ EXPECT_TRUE(SetCookie(cm.get(), http_www_google_.url(), "B=Bar"));
+ this->MatchCookieLines("A=Foo; B=Bar",
+ GetCookies(cm.get(), http_www_google_.url()));
EXPECT_EQ(5u, store->commands().size());
}
@@ -2850,21 +2911,23 @@ TEST_F(CookieMonsterTest, CookieSourceHistogram) {
histograms.ExpectTotalCount(cookie_source_histogram, 0);
// Set a Secure cookie on a cryptographic scheme.
- EXPECT_TRUE(SetCookie(cm.get(), url_google_secure_, "A=B; path=/; Secure"));
+ EXPECT_TRUE(
+ SetCookie(cm.get(), https_www_google_.url(), "A=B; path=/; Secure"));
histograms.ExpectTotalCount(cookie_source_histogram, 1);
histograms.ExpectBucketCount(
cookie_source_histogram,
CookieMonster::COOKIE_SOURCE_SECURE_COOKIE_CRYPTOGRAPHIC_SCHEME, 1);
// Set a non-Secure cookie on a cryptographic scheme.
- EXPECT_TRUE(SetCookie(cm.get(), url_google_secure_, "C=D; path=/;"));
+ EXPECT_TRUE(SetCookie(cm.get(), https_www_google_.url(), "C=D; path=/;"));
histograms.ExpectTotalCount(cookie_source_histogram, 2);
histograms.ExpectBucketCount(
cookie_source_histogram,
CookieMonster::COOKIE_SOURCE_NONSECURE_COOKIE_CRYPTOGRAPHIC_SCHEME, 1);
// Set a Secure cookie on a non-cryptographic scheme.
- EXPECT_TRUE(SetCookie(cm.get(), url_google_, "D=E; path=/; Secure"));
+ EXPECT_TRUE(
+ SetCookie(cm.get(), http_www_google_.url(), "D=E; path=/; Secure"));
histograms.ExpectTotalCount(cookie_source_histogram, 3);
histograms.ExpectBucketCount(
cookie_source_histogram,
@@ -2872,7 +2935,8 @@ TEST_F(CookieMonsterTest, CookieSourceHistogram) {
// Overwrite a Secure cookie (set by a cryptographic scheme) on a
// non-cryptographic scheme.
- EXPECT_TRUE(SetCookie(cm.get(), url_google_, "A=B; path=/; Secure"));
+ EXPECT_TRUE(
+ SetCookie(cm.get(), http_www_google_.url(), "A=B; path=/; Secure"));
histograms.ExpectTotalCount(cookie_source_histogram, 4);
histograms.ExpectBucketCount(
cookie_source_histogram,
@@ -2883,18 +2947,19 @@ TEST_F(CookieMonsterTest, CookieSourceHistogram) {
// Test that clearing a Secure cookie on a http:// URL does not get
// counted.
- EXPECT_TRUE(SetCookie(cm.get(), url_google_secure_, "F=G; path=/; Secure"));
+ EXPECT_TRUE(
+ SetCookie(cm.get(), https_www_google_.url(), "F=G; path=/; Secure"));
histograms.ExpectTotalCount(cookie_source_histogram, 5);
- std::string cookies1 = GetCookies(cm.get(), url_google_secure_);
+ std::string cookies1 = GetCookies(cm.get(), https_www_google_.url());
EXPECT_NE(std::string::npos, cookies1.find("F=G"));
- EXPECT_TRUE(SetCookie(cm.get(), url_google_,
+ EXPECT_TRUE(SetCookie(cm.get(), http_www_google_.url(),
"F=G; path=/; Expires=Thu, 01-Jan-1970 00:00:01 GMT"));
- std::string cookies2 = GetCookies(cm.get(), url_google_secure_);
+ std::string cookies2 = GetCookies(cm.get(), https_www_google_.url());
EXPECT_EQ(std::string::npos, cookies2.find("F=G"));
histograms.ExpectTotalCount(cookie_source_histogram, 5);
// Set a non-Secure cookie on a non-cryptographic scheme.
- EXPECT_TRUE(SetCookie(cm.get(), url_google_, "H=I; path=/"));
+ EXPECT_TRUE(SetCookie(cm.get(), http_www_google_.url(), "H=I; path=/"));
histograms.ExpectTotalCount(cookie_source_histogram, 6);
histograms.ExpectBucketCount(
cookie_source_histogram,
« no previous file with comments | « no previous file | net/cookies/cookie_store_unittest.h » ('j') | net/cookies/cookie_store_unittest.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698