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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/base/static_cookie_policy_unittest.cc

Issue 2655443003: Unify the "get" and "set" cookie access settings. (Closed)
Patch Set: fix android Created 3 years, 11 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
« components/content_settings/core/browser/cookie_settings.cc ('K') | « net/base/static_cookie_policy.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/base/static_cookie_policy_unittest.cc
diff --git a/net/base/static_cookie_policy_unittest.cc b/net/base/static_cookie_policy_unittest.cc
index f2d9abf437405d60c68bbade886da03103277c25..e963e99fa9a0e9f9e9a7c650cd04ccf86d51c57a 100644
--- a/net/base/static_cookie_policy_unittest.cc
+++ b/net/base/static_cookie_policy_unittest.cc
@@ -24,11 +24,8 @@ class StaticCookiePolicyTest : public testing::Test {
void SetPolicyType(StaticCookiePolicy::Type type) {
policy_.set_type(type);
}
- int CanGetCookies(const GURL& url, const GURL& first_party) {
- return policy_.CanGetCookies(url, first_party);
- }
- int CanSetCookie(const GURL& url, const GURL& first_party) {
- return policy_.CanSetCookie(url, first_party);
+ int CanAccessCookies(const GURL& url, const GURL& first_party) {
+ return policy_.CanAccessCookies(url, first_party);
}
protected:
StaticCookiePolicy policy_;
@@ -39,65 +36,41 @@ class StaticCookiePolicyTest : public testing::Test {
};
TEST_F(StaticCookiePolicyTest, DefaultPolicyTest) {
- EXPECT_THAT(CanGetCookies(url_google_, url_google_), IsOk());
- EXPECT_THAT(CanGetCookies(url_google_, url_google_secure_), IsOk());
- EXPECT_THAT(CanGetCookies(url_google_, url_google_mail_), IsOk());
- EXPECT_THAT(CanGetCookies(url_google_, url_google_analytics_), IsOk());
- EXPECT_THAT(CanGetCookies(url_google_, GURL()), IsOk());
-
- EXPECT_THAT(CanSetCookie(url_google_, url_google_), IsOk());
- EXPECT_THAT(CanSetCookie(url_google_, url_google_secure_), IsOk());
- EXPECT_THAT(CanSetCookie(url_google_, url_google_mail_), IsOk());
- EXPECT_THAT(CanSetCookie(url_google_, url_google_analytics_), IsOk());
- EXPECT_THAT(CanSetCookie(url_google_, GURL()), IsOk());
+ EXPECT_THAT(CanAccessCookies(url_google_, url_google_), IsOk());
+ EXPECT_THAT(CanAccessCookies(url_google_, url_google_secure_), IsOk());
+ EXPECT_THAT(CanAccessCookies(url_google_, url_google_mail_), IsOk());
+ EXPECT_THAT(CanAccessCookies(url_google_, url_google_analytics_), IsOk());
+ EXPECT_THAT(CanAccessCookies(url_google_, GURL()), IsOk());
}
TEST_F(StaticCookiePolicyTest, AllowAllCookiesTest) {
SetPolicyType(StaticCookiePolicy::ALLOW_ALL_COOKIES);
- EXPECT_THAT(CanGetCookies(url_google_, url_google_), IsOk());
- EXPECT_THAT(CanGetCookies(url_google_, url_google_secure_), IsOk());
- EXPECT_THAT(CanGetCookies(url_google_, url_google_mail_), IsOk());
- EXPECT_THAT(CanGetCookies(url_google_, url_google_analytics_), IsOk());
- EXPECT_THAT(CanGetCookies(url_google_, GURL()), IsOk());
-
- EXPECT_THAT(CanSetCookie(url_google_, url_google_), IsOk());
- EXPECT_THAT(CanSetCookie(url_google_, url_google_secure_), IsOk());
- EXPECT_THAT(CanSetCookie(url_google_, url_google_mail_), IsOk());
- EXPECT_THAT(CanSetCookie(url_google_, url_google_analytics_), IsOk());
- EXPECT_THAT(CanSetCookie(url_google_, GURL()), IsOk());
+ EXPECT_THAT(CanAccessCookies(url_google_, url_google_), IsOk());
+ EXPECT_THAT(CanAccessCookies(url_google_, url_google_secure_), IsOk());
+ EXPECT_THAT(CanAccessCookies(url_google_, url_google_mail_), IsOk());
+ EXPECT_THAT(CanAccessCookies(url_google_, url_google_analytics_), IsOk());
+ EXPECT_THAT(CanAccessCookies(url_google_, GURL()), IsOk());
}
TEST_F(StaticCookiePolicyTest, BlockAllThirdPartyCookiesTest) {
SetPolicyType(StaticCookiePolicy::BLOCK_ALL_THIRD_PARTY_COOKIES);
- EXPECT_THAT(CanGetCookies(url_google_, url_google_), IsOk());
- EXPECT_THAT(CanGetCookies(url_google_, url_google_secure_), IsOk());
- EXPECT_THAT(CanGetCookies(url_google_, url_google_mail_), IsOk());
- EXPECT_NE(OK, CanGetCookies(url_google_, url_google_analytics_));
- EXPECT_THAT(CanGetCookies(url_google_, GURL()), IsOk());
-
- EXPECT_THAT(CanSetCookie(url_google_, url_google_), IsOk());
- EXPECT_THAT(CanSetCookie(url_google_, url_google_secure_), IsOk());
- EXPECT_THAT(CanSetCookie(url_google_, url_google_mail_), IsOk());
- EXPECT_NE(OK, CanSetCookie(url_google_, url_google_analytics_));
- EXPECT_THAT(CanSetCookie(url_google_, GURL()), IsOk());
+ EXPECT_THAT(CanAccessCookies(url_google_, url_google_), IsOk());
+ EXPECT_THAT(CanAccessCookies(url_google_, url_google_secure_), IsOk());
+ EXPECT_THAT(CanAccessCookies(url_google_, url_google_mail_), IsOk());
+ EXPECT_NE(OK, CanAccessCookies(url_google_, url_google_analytics_));
+ EXPECT_THAT(CanAccessCookies(url_google_, GURL()), IsOk());
}
TEST_F(StaticCookiePolicyTest, BlockAllCookiesTest) {
SetPolicyType(StaticCookiePolicy::BLOCK_ALL_COOKIES);
- EXPECT_NE(OK, CanGetCookies(url_google_, url_google_));
- EXPECT_NE(OK, CanGetCookies(url_google_, url_google_secure_));
- EXPECT_NE(OK, CanGetCookies(url_google_, url_google_mail_));
- EXPECT_NE(OK, CanGetCookies(url_google_, url_google_analytics_));
- EXPECT_NE(OK, CanGetCookies(url_google_, GURL()));
-
- EXPECT_NE(OK, CanSetCookie(url_google_, url_google_));
- EXPECT_NE(OK, CanSetCookie(url_google_, url_google_secure_));
- EXPECT_NE(OK, CanSetCookie(url_google_, url_google_mail_));
- EXPECT_NE(OK, CanSetCookie(url_google_, url_google_analytics_));
- EXPECT_NE(OK, CanSetCookie(url_google_, GURL()));
+ EXPECT_NE(OK, CanAccessCookies(url_google_, url_google_));
+ EXPECT_NE(OK, CanAccessCookies(url_google_, url_google_secure_));
+ EXPECT_NE(OK, CanAccessCookies(url_google_, url_google_mail_));
+ EXPECT_NE(OK, CanAccessCookies(url_google_, url_google_analytics_));
+ EXPECT_NE(OK, CanAccessCookies(url_google_, GURL()));
}
} // namespace net
« components/content_settings/core/browser/cookie_settings.cc ('K') | « net/base/static_cookie_policy.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698