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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/cookies/cookie_store_unittest.h

Issue 266243004: Clang format slam. Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 7 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
« net/base/mime_util_unittest.cc ('K') | « net/cookies/cookie_store_test_helpers.cc ('k') | net/cookies/cookie_util.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/cookies/cookie_store_unittest.h
diff --git a/net/cookies/cookie_store_unittest.h b/net/cookies/cookie_store_unittest.h
index f0fcd71fd97e27cf59dfffc36c161601c4ed7fb6..04e5a05c3a74f5890bce41319ae3f0500f3ace99 100644
--- a/net/cookies/cookie_store_unittest.h
+++ b/net/cookies/cookie_store_unittest.h
@@ -91,10 +91,10 @@ class CookieStoreTest : public testing::Test {
if (!CookieStoreTestTraits::supports_http_only)
options.set_include_httponly();
StringResultCookieCallback callback;
- cs->GetCookiesWithOptionsAsync(
- url, options,
- base::Bind(&StringResultCookieCallback::Run,
- base::Unretained(&callback)));
+ cs->GetCookiesWithOptionsAsync(url,
+ options,
+ base::Bind(&StringResultCookieCallback::Run,
+ base::Unretained(&callback)));
RunFor(kTimeout);
EXPECT_TRUE(callback.did_run());
return callback.result();
@@ -105,9 +105,10 @@ class CookieStoreTest : public testing::Test {
const CookieOptions& options) {
DCHECK(cs);
StringResultCookieCallback callback;
- cs->GetCookiesWithOptionsAsync(
- url, options, base::Bind(&StringResultCookieCallback::Run,
- base::Unretained(&callback)));
+ cs->GetCookiesWithOptionsAsync(url,
+ options,
+ base::Bind(&StringResultCookieCallback::Run,
+ base::Unretained(&callback)));
RunFor(kTimeout);
EXPECT_TRUE(callback.did_run());
return callback.result();
@@ -120,10 +121,11 @@ class CookieStoreTest : public testing::Test {
DCHECK(cs);
ResultSavingCookieCallback<bool> callback;
cs->SetCookieWithOptionsAsync(
- url, cookie_line, options,
- base::Bind(
- &ResultSavingCookieCallback<bool>::Run,
- base::Unretained(&callback)));
+ url,
+ cookie_line,
+ options,
+ base::Bind(&ResultSavingCookieCallback<bool>::Run,
+ base::Unretained(&callback)));
RunFor(kTimeout);
EXPECT_TRUE(callback.did_run());
return callback.result();
@@ -155,22 +157,23 @@ class CookieStoreTest : public testing::Test {
DCHECK(cs);
NoResultCookieCallback callback;
cs->DeleteCookieAsync(
- url, cookie_name,
+ url,
+ cookie_name,
base::Bind(&NoResultCookieCallback::Run, base::Unretained(&callback)));
RunFor(kTimeout);
EXPECT_TRUE(callback.did_run());
}
int DeleteCreatedBetween(CookieStore* cs,
- const base::Time& delete_begin,
- const base::Time& delete_end) {
+ const base::Time& delete_begin,
+ const base::Time& delete_end) {
DCHECK(cs);
ResultSavingCookieCallback<int> callback;
cs->DeleteAllCreatedBetweenAsync(
- delete_begin, delete_end,
- base::Bind(
- &ResultSavingCookieCallback<int>::Run,
- base::Unretained(&callback)));
+ delete_begin,
+ delete_end,
+ base::Bind(&ResultSavingCookieCallback<int>::Run,
+ base::Unretained(&callback)));
RunFor(kTimeout);
EXPECT_TRUE(callback.did_run());
return callback.result();
@@ -183,10 +186,11 @@ class CookieStoreTest : public testing::Test {
DCHECK(cs);
ResultSavingCookieCallback<int> callback;
cs->DeleteAllCreatedBetweenForHostAsync(
- delete_begin, delete_end, url,
- base::Bind(
- &ResultSavingCookieCallback<int>::Run,
- base::Unretained(&callback)));
+ delete_begin,
+ delete_end,
+ url,
+ base::Bind(&ResultSavingCookieCallback<int>::Run,
+ base::Unretained(&callback)));
RunFor(kTimeout);
EXPECT_TRUE(callback.did_run());
return callback.result();
@@ -195,10 +199,8 @@ class CookieStoreTest : public testing::Test {
int DeleteSessionCookies(CookieStore* cs) {
DCHECK(cs);
ResultSavingCookieCallback<int> callback;
- cs->DeleteSessionCookiesAsync(
- base::Bind(
- &ResultSavingCookieCallback<int>::Run,
- base::Unretained(&callback)));
+ cs->DeleteSessionCookiesAsync(base::Bind(
+ &ResultSavingCookieCallback<int>::Run, base::Unretained(&callback)));
RunFor(kTimeout);
EXPECT_TRUE(callback.did_run());
return callback.result();
@@ -229,18 +231,19 @@ class CookieStoreTest : public testing::Test {
const std::string& line) {
std::string cookies = GetCookies(cs, url);
bool matched = (TokenizeCookieLine(line) == TokenizeCookieLine(cookies));
- base::Time polling_end_date = base::Time::Now() +
+ base::Time polling_end_date =
+ base::Time::Now() +
base::TimeDelta::FromMilliseconds(
CookieStoreTestTraits::creation_time_granularity_in_ms);
- while (!matched && base::Time::Now() <= polling_end_date) {
+ while (!matched && base::Time::Now() <= polling_end_date) {
base::PlatformThread::Sleep(base::TimeDelta::FromMilliseconds(10));
cookies = GetCookies(cs, url);
matched = (TokenizeCookieLine(line) == TokenizeCookieLine(cookies));
}
- EXPECT_TRUE(matched) << "\"" << cookies
- << "\" does not match \"" << line << "\"";
+ EXPECT_TRUE(matched) << "\"" << cookies << "\" does not match \"" << line
+ << "\"";
}
GURL url_google_;
@@ -267,8 +270,9 @@ TYPED_TEST_CASE_P(CookieStoreTest);
TYPED_TEST_P(CookieStoreTest, TypeTest) {
scoped_refptr<CookieStore> cs(this->GetCookieStore());
EXPECT_EQ(cs->GetCookieMonster(),
- (TypeParam::is_cookie_monster) ?
- static_cast<CookieMonster*>(cs.get()) : NULL);
+ (TypeParam::is_cookie_monster)
+ ? static_cast<CookieMonster*>(cs.get())
+ : NULL);
}
TYPED_TEST_P(CookieStoreTest, DomainTest) {
@@ -447,7 +451,7 @@ TYPED_TEST_P(CookieStoreTest, DomainWithoutLeadingDotTest) {
// Test that the domain specified in cookie string is treated case-insensitive
// http://b/issue?id=896475.
TYPED_TEST_P(CookieStoreTest, CaseInsensitiveDomainTest) {
- scoped_refptr<CookieStore> cs(this->GetCookieStore());
+ scoped_refptr<CookieStore> cs(this->GetCookieStore());
GURL url("http://www.google.com");
EXPECT_TRUE(this->SetCookie(cs.get(), url, "a=1; domain=.GOOGLE.COM"));
EXPECT_TRUE(this->SetCookie(cs.get(), url, "b=2; domain=.wWw.gOOgLE.coM"));
@@ -752,8 +756,8 @@ TYPED_TEST_P(CookieStoreTest, TestCookieDeletion) {
this->MatchCookieLines("A=B", this->GetCookies(cs.get(), this->url_google_));
// Check that it is not deleted with significant enough clock skew.
base::Time server_time;
- EXPECT_TRUE(base::Time::FromString("Sun, 17-Apr-1977 22:50:13 GMT",
- &server_time));
+ EXPECT_TRUE(
+ base::Time::FromString("Sun, 17-Apr-1977 22:50:13 GMT", &server_time));
EXPECT_TRUE(this->SetCookieWithServerTime(
cs.get(),
this->url_google_,
@@ -778,14 +782,14 @@ TYPED_TEST_P(CookieStoreTest, TestCookieDeletion) {
TYPED_TEST_P(CookieStoreTest, TestDeleteAllCreatedBetween) {
scoped_refptr<CookieStore> cs(this->GetCookieStore());
- const base::Time last_month = base::Time::Now() -
- base::TimeDelta::FromDays(30);
- const base::Time last_minute = base::Time::Now() -
- base::TimeDelta::FromMinutes(1);
- const base::Time next_minute = base::Time::Now() +
- base::TimeDelta::FromMinutes(1);
- const base::Time next_month = base::Time::Now() +
- base::TimeDelta::FromDays(30);
+ const base::Time last_month =
+ base::Time::Now() - base::TimeDelta::FromDays(30);
+ const base::Time last_minute =
+ base::Time::Now() - base::TimeDelta::FromMinutes(1);
+ const base::Time next_minute =
+ base::Time::Now() + base::TimeDelta::FromMinutes(1);
+ const base::Time next_month =
+ base::Time::Now() + base::TimeDelta::FromDays(30);
// Add a cookie.
EXPECT_TRUE(this->SetCookie(cs.get(), this->url_google_, "A=B"));
@@ -830,20 +834,18 @@ TYPED_TEST_P(CookieStoreTest, TestDeleteAllCreatedBetweenForHost) {
EXPECT_TRUE(this->SetCookie(cs.get(), url_not_google, "E=F"));
// Delete cookies.
- EXPECT_EQ(
- 3, // Deletes A=B, C=D, Y=Z
- this->DeleteAllCreatedBetweenForHost(
- cs.get(), now, base::Time::Max(), this->url_google_));
+ EXPECT_EQ(3, // Deletes A=B, C=D, Y=Z
+ this->DeleteAllCreatedBetweenForHost(
+ cs.get(), now, base::Time::Max(), this->url_google_));
}
TYPED_TEST_P(CookieStoreTest, TestSecure) {
- scoped_refptr<CookieStore> cs(this->GetCookieStore());
+ scoped_refptr<CookieStore> cs(this->GetCookieStore());
- EXPECT_TRUE(this->SetCookie(cs.get(), this->url_google_, "A=B"));
- this->MatchCookieLines("A=B",
- this->GetCookies(cs.get(), this->url_google_));
- this->MatchCookieLines(
- "A=B", this->GetCookies(cs.get(), this->url_google_secure_));
+ EXPECT_TRUE(this->SetCookie(cs.get(), this->url_google_, "A=B"));
+ this->MatchCookieLines("A=B", this->GetCookies(cs.get(), this->url_google_));
+ this->MatchCookieLines("A=B",
+ this->GetCookies(cs.get(), this->url_google_secure_));
EXPECT_TRUE(
this->SetCookie(cs.get(), this->url_google_secure_, "A=B; secure"));
@@ -1024,9 +1026,9 @@ REGISTER_TYPED_TEST_CASE_P(CookieStoreTest,
CookieOrdering,
DeleteSessionCookie);
-template<class CookieStoreTestTraits>
-class MultiThreadedCookieStoreTest :
- public CookieStoreTest<CookieStoreTestTraits> {
+template <class CookieStoreTestTraits>
+class MultiThreadedCookieStoreTest
+ : public CookieStoreTest<CookieStoreTestTraits> {
public:
MultiThreadedCookieStoreTest() : other_thread_("CMTthread") {}
@@ -1039,20 +1041,20 @@ class MultiThreadedCookieStoreTest :
CookieOptions options;
if (!CookieStoreTestTraits::supports_http_only)
options.set_include_httponly();
- cs->GetCookiesWithOptionsAsync(
- url, options,
- base::Bind(&StringResultCookieCallback::Run,
- base::Unretained(callback)));
+ cs->GetCookiesWithOptionsAsync(url,
+ options,
+ base::Bind(&StringResultCookieCallback::Run,
+ base::Unretained(callback)));
}
void GetCookiesWithOptionsTask(CookieStore* cs,
const GURL& url,
const CookieOptions& options,
StringResultCookieCallback* callback) {
- cs->GetCookiesWithOptionsAsync(
- url, options,
- base::Bind(&StringResultCookieCallback::Run,
- base::Unretained(callback)));
+ cs->GetCookiesWithOptionsAsync(url,
+ options,
+ base::Bind(&StringResultCookieCallback::Run,
+ base::Unretained(callback)));
}
void SetCookieWithOptionsTask(CookieStore* cs,
@@ -1061,10 +1063,11 @@ class MultiThreadedCookieStoreTest :
const CookieOptions& options,
ResultSavingCookieCallback<bool>* callback) {
cs->SetCookieWithOptionsAsync(
- url, cookie_line, options,
- base::Bind(
- &ResultSavingCookieCallback<bool>::Run,
- base::Unretained(callback)));
+ url,
+ cookie_line,
+ options,
+ base::Bind(&ResultSavingCookieCallback<bool>::Run,
+ base::Unretained(callback)));
}
void DeleteCookieTask(CookieStore* cs,
@@ -1072,16 +1075,15 @@ class MultiThreadedCookieStoreTest :
const std::string& cookie_name,
NoResultCookieCallback* callback) {
cs->DeleteCookieAsync(
- url, cookie_name,
+ url,
+ cookie_name,
base::Bind(&NoResultCookieCallback::Run, base::Unretained(callback)));
}
- void DeleteSessionCookiesTask(CookieStore* cs,
- ResultSavingCookieCallback<int>* callback) {
- cs->DeleteSessionCookiesAsync(
- base::Bind(
- &ResultSavingCookieCallback<int>::Run,
- base::Unretained(callback)));
+ void DeleteSessionCookiesTask(CookieStore* cs,
+ ResultSavingCookieCallback<int>* callback) {
+ cs->DeleteSessionCookiesAsync(base::Bind(
+ &ResultSavingCookieCallback<int>::Run, base::Unretained(callback)));
}
protected:
@@ -1105,10 +1107,12 @@ TYPED_TEST_P(MultiThreadedCookieStoreTest, ThreadCheckGetCookies) {
EXPECT_TRUE(this->SetCookie(cs.get(), this->url_google_, "A=B"));
this->MatchCookieLines("A=B", this->GetCookies(cs.get(), this->url_google_));
StringResultCookieCallback callback(&this->other_thread_);
- base::Closure task = base::Bind(
- &net::MultiThreadedCookieStoreTest<TypeParam>::GetCookiesTask,
- base::Unretained(this),
- cs, this->url_google_, &callback);
+ base::Closure task =
+ base::Bind(&net::MultiThreadedCookieStoreTest<TypeParam>::GetCookiesTask,
+ base::Unretained(this),
+ cs,
+ this->url_google_,
+ &callback);
this->RunOnOtherThread(task);
EXPECT_TRUE(callback.did_run());
EXPECT_EQ("A=B", callback.result());
@@ -1126,7 +1130,10 @@ TYPED_TEST_P(MultiThreadedCookieStoreTest, ThreadCheckGetCookiesWithOptions) {
base::Closure task = base::Bind(
&net::MultiThreadedCookieStoreTest<TypeParam>::GetCookiesWithOptionsTask,
base::Unretained(this),
- cs, this->url_google_, options, &callback);
+ cs,
+ this->url_google_,
+ options,
+ &callback);
this->RunOnOtherThread(task);
EXPECT_TRUE(callback.did_run());
EXPECT_EQ("A=B", callback.result());
@@ -1143,7 +1150,11 @@ TYPED_TEST_P(MultiThreadedCookieStoreTest, ThreadCheckSetCookieWithOptions) {
base::Closure task = base::Bind(
&net::MultiThreadedCookieStoreTest<TypeParam>::SetCookieWithOptionsTask,
base::Unretained(this),
- cs, this->url_google_, "A=B", options, &callback);
+ cs,
+ this->url_google_,
+ "A=B",
+ options,
+ &callback);
this->RunOnOtherThread(task);
EXPECT_TRUE(callback.did_run());
EXPECT_TRUE(callback.result());
@@ -1163,7 +1174,10 @@ TYPED_TEST_P(MultiThreadedCookieStoreTest, ThreadCheckDeleteCookie) {
base::Closure task = base::Bind(
&net::MultiThreadedCookieStoreTest<TypeParam>::DeleteCookieTask,
base::Unretained(this),
- cs, this->url_google_, "A", &callback);
+ cs,
+ this->url_google_,
+ "A",
+ &callback);
this->RunOnOtherThread(task);
EXPECT_TRUE(callback.did_run());
}
@@ -1188,7 +1202,8 @@ TYPED_TEST_P(MultiThreadedCookieStoreTest, ThreadCheckDeleteSessionCookies) {
base::Closure task = base::Bind(
&net::MultiThreadedCookieStoreTest<TypeParam>::DeleteSessionCookiesTask,
base::Unretained(this),
- cs, &callback);
+ cs,
+ &callback);
this->RunOnOtherThread(task);
EXPECT_TRUE(callback.did_run());
EXPECT_EQ(1, callback.result());
« net/base/mime_util_unittest.cc ('K') | « net/cookies/cookie_store_test_helpers.cc ('k') | net/cookies/cookie_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698