diff options
| author | mkwst@chromium.org <mkwst@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-16 11:45:07 +0000 |
|---|---|---|
| committer | mkwst@chromium.org <mkwst@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-16 11:45:07 +0000 |
| commit | c90ddfcfd61ae1fb403814e7794ca3a86aa548b2 (patch) | |
| tree | 9def59decf604e87500145624287127475a9e2df /net | |
| parent | 2dba237748d3297fa11b4638e8f3c74538a6f1aa (diff) | |
| download | chromium_src-c90ddfcfd61ae1fb403814e7794ca3a86aa548b2.zip chromium_src-c90ddfcfd61ae1fb403814e7794ca3a86aa548b2.tar.gz chromium_src-c90ddfcfd61ae1fb403814e7794ca3a86aa548b2.tar.bz2 | |
Remove '--only-block-setting-third-party-cookies' flag.
BUG=350870
Review URL: https://codereview.chromium.org/189463020
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@257366 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
| -rw-r--r-- | net/base/static_cookie_policy.cc | 2 | ||||
| -rw-r--r-- | net/base/static_cookie_policy.h | 2 | ||||
| -rw-r--r-- | net/base/static_cookie_policy_unittest.cc | 16 |
3 files changed, 0 insertions, 20 deletions
diff --git a/net/base/static_cookie_policy.cc b/net/base/static_cookie_policy.cc index d9c0860..021cace 100644 --- a/net/base/static_cookie_policy.cc +++ b/net/base/static_cookie_policy.cc @@ -16,7 +16,6 @@ int StaticCookiePolicy::CanGetCookies( const GURL& first_party_for_cookies) const { switch (type_) { case StaticCookiePolicy::ALLOW_ALL_COOKIES: - case StaticCookiePolicy::BLOCK_SETTING_THIRD_PARTY_COOKIES: return OK; case StaticCookiePolicy::BLOCK_ALL_THIRD_PARTY_COOKIES: if (first_party_for_cookies.is_empty()) @@ -40,7 +39,6 @@ int StaticCookiePolicy::CanSetCookie( switch (type_) { case StaticCookiePolicy::ALLOW_ALL_COOKIES: return OK; - case StaticCookiePolicy::BLOCK_SETTING_THIRD_PARTY_COOKIES: case StaticCookiePolicy::BLOCK_ALL_THIRD_PARTY_COOKIES: if (first_party_for_cookies.is_empty()) return OK; // Empty first-party URL indicates a first-party request. diff --git a/net/base/static_cookie_policy.h b/net/base/static_cookie_policy.h index eaf2f97..0231531 100644 --- a/net/base/static_cookie_policy.h +++ b/net/base/static_cookie_policy.h @@ -21,8 +21,6 @@ class NET_EXPORT StaticCookiePolicy { enum Type { // Do not perform any cookie blocking. ALLOW_ALL_COOKIES = 0, - // Prevent only third-party cookies from being set. - BLOCK_SETTING_THIRD_PARTY_COOKIES, // Block all cookies (third-party or not) from begin set or read. BLOCK_ALL_COOKIES, // Prevent only third-party cookies from being set or read. diff --git a/net/base/static_cookie_policy_unittest.cc b/net/base/static_cookie_policy_unittest.cc index eb1d40b..7749411 100644 --- a/net/base/static_cookie_policy_unittest.cc +++ b/net/base/static_cookie_policy_unittest.cc @@ -64,22 +64,6 @@ TEST_F(StaticCookiePolicyTest, AllowAllCookiesTest) { EXPECT_EQ(OK, CanSetCookie(url_google_, GURL())); } -TEST_F(StaticCookiePolicyTest, BlockSettingThirdPartyCookiesTest) { - SetPolicyType(StaticCookiePolicy::BLOCK_SETTING_THIRD_PARTY_COOKIES); - - EXPECT_EQ(OK, CanGetCookies(url_google_, url_google_)); - EXPECT_EQ(OK, CanGetCookies(url_google_, url_google_secure_)); - EXPECT_EQ(OK, CanGetCookies(url_google_, url_google_mail_)); - EXPECT_EQ(OK, CanGetCookies(url_google_, url_google_analytics_)); - EXPECT_EQ(OK, CanGetCookies(url_google_, GURL())); - - EXPECT_EQ(OK, CanSetCookie(url_google_, url_google_)); - EXPECT_EQ(OK, CanSetCookie(url_google_, url_google_secure_)); - EXPECT_EQ(OK, CanSetCookie(url_google_, url_google_mail_)); - EXPECT_NE(OK, CanSetCookie(url_google_, url_google_analytics_)); - EXPECT_EQ(OK, CanSetCookie(url_google_, GURL())); -} - TEST_F(StaticCookiePolicyTest, BlockAllThirdPartyCookiesTest) { SetPolicyType(StaticCookiePolicy::BLOCK_ALL_THIRD_PARTY_COOKIES); |