Commit f1af4b3d authored by Caleb Raitto's avatar Caleb Raitto Committed by Commit Bot

Remove parsing support for SameSite=Extended.

The attribute value is still parsed for UMA metrics only.

Bug: 953995
Change-Id: If80a818c9722625a07fc25e6f35be6394c587d12
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1883291Reviewed-by: default avatarLily Chen <chlily@chromium.org>
Commit-Queue: Lily Chen <chlily@chromium.org>
Commit-Queue: Caleb Raitto <caraitto@chromium.org>
Cr-Commit-Position: refs/heads/master@{#710015}
parent 7ce02641
...@@ -143,7 +143,7 @@ TEST(CanonicalCookieTest, Create) { ...@@ -143,7 +143,7 @@ TEST(CanonicalCookieTest, Create) {
cookie = CanonicalCookie::Create(url, "A=2; SameSite=Extended", creation_time, cookie = CanonicalCookie::Create(url, "A=2; SameSite=Extended", creation_time,
server_time); server_time);
ASSERT_TRUE(cookie.get()); ASSERT_TRUE(cookie.get());
EXPECT_EQ(CookieSameSite::EXTENDED_MODE, cookie->SameSite()); EXPECT_EQ(CookieSameSite::UNSPECIFIED, cookie->SameSite());
cookie = CanonicalCookie::Create(url, "A=2; SameSite=None", creation_time, cookie = CanonicalCookie::Create(url, "A=2; SameSite=None", creation_time,
server_time); server_time);
ASSERT_TRUE(cookie.get()); ASSERT_TRUE(cookie.get());
......
...@@ -91,7 +91,7 @@ CookieSameSite StringToCookieSameSite(const std::string& same_site, ...@@ -91,7 +91,7 @@ CookieSameSite StringToCookieSameSite(const std::string& same_site,
samesite = CookieSameSite::STRICT_MODE; samesite = CookieSameSite::STRICT_MODE;
*samesite_string = CookieSameSiteString::kStrict; *samesite_string = CookieSameSiteString::kStrict;
} else if (base::EqualsCaseInsensitiveASCII(same_site, kSameSiteExtended)) { } else if (base::EqualsCaseInsensitiveASCII(same_site, kSameSiteExtended)) {
samesite = CookieSameSite::EXTENDED_MODE; // Extended isn't supported anymore -- we just parse it for UMA stats.
*samesite_string = CookieSameSiteString::kExtended; *samesite_string = CookieSameSiteString::kExtended;
} else if (same_site == "") { } else if (same_site == "") {
*samesite_string = CookieSameSiteString::kEmptyString; *samesite_string = CookieSameSiteString::kEmptyString;
......
...@@ -50,9 +50,9 @@ TEST(CookieConstantsTest, TestCookieSameSite) { ...@@ -50,9 +50,9 @@ TEST(CookieConstantsTest, TestCookieSameSite) {
EXPECT_EQ(CookieSameSite::STRICT_MODE, StringToCookieSameSite("Strict")); EXPECT_EQ(CookieSameSite::STRICT_MODE, StringToCookieSameSite("Strict"));
EXPECT_EQ(CookieSameSite::STRICT_MODE, StringToCookieSameSite("STRICT")); EXPECT_EQ(CookieSameSite::STRICT_MODE, StringToCookieSameSite("STRICT"));
EXPECT_EQ(CookieSameSite::STRICT_MODE, StringToCookieSameSite("sTrIcT")); EXPECT_EQ(CookieSameSite::STRICT_MODE, StringToCookieSameSite("sTrIcT"));
EXPECT_EQ(CookieSameSite::EXTENDED_MODE, StringToCookieSameSite("extended")); EXPECT_EQ(CookieSameSite::UNSPECIFIED, StringToCookieSameSite("extended"));
EXPECT_EQ(CookieSameSite::EXTENDED_MODE, StringToCookieSameSite("EXTENDED")); EXPECT_EQ(CookieSameSite::UNSPECIFIED, StringToCookieSameSite("EXTENDED"));
EXPECT_EQ(CookieSameSite::EXTENDED_MODE, StringToCookieSameSite("ExtenDED")); EXPECT_EQ(CookieSameSite::UNSPECIFIED, StringToCookieSameSite("ExtenDED"));
// Unrecognized tokens are interpreted as UNSPECIFIED. // Unrecognized tokens are interpreted as UNSPECIFIED.
const char* const bad_tokens[] = {"", "foo", "none ", const char* const bad_tokens[] = {"", "foo", "none ",
......
...@@ -526,7 +526,7 @@ TEST(ParsedCookieTest, CookieSameSiteStringEnum) { ...@@ -526,7 +526,7 @@ TEST(ParsedCookieTest, CookieSameSiteStringEnum) {
EXPECT_EQ(CookieSameSiteString::kNone, actual); EXPECT_EQ(CookieSameSiteString::kNone, actual);
pc.SetSameSite("Extended"); pc.SetSameSite("Extended");
EXPECT_EQ(CookieSameSite::EXTENDED_MODE, pc.SameSite(&actual)); EXPECT_EQ(CookieSameSite::UNSPECIFIED, pc.SameSite(&actual));
EXPECT_EQ(CookieSameSiteString::kExtended, actual); EXPECT_EQ(CookieSameSiteString::kExtended, actual);
pc.SetSameSite("Bananas"); pc.SetSameSite("Bananas");
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment