Commit 106224d3 authored by Caleb Raitto's avatar Caleb Raitto Committed by Commit Bot

Remove net::ExclusionReason::EXCLUDE_SAMESITE_EXTENDED.

Bug: 953995
Change-Id: I6e137d81a43a67ca001ec67c77330656664de561
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1894024Reviewed-by: default avatarLily Chen <chlily@chromium.org>
Reviewed-by: default avatarYang Guo <yangguo@chromium.org>
Reviewed-by: default avatarAndrey Kosyakov <caseq@chromium.org>
Commit-Queue: Caleb Raitto <caraitto@chromium.org>
Cr-Commit-Position: refs/heads/master@{#712339}
parent 195877f7
...@@ -580,11 +580,6 @@ GetProtocolBlockedSetCookieReason( ...@@ -580,11 +580,6 @@ GetProtocolBlockedSetCookieReason(
net::CanonicalCookie::CookieInclusionStatus::EXCLUDE_SAMESITE_LAX)) { net::CanonicalCookie::CookieInclusionStatus::EXCLUDE_SAMESITE_LAX)) {
blockedReasons->push_back(Network::SetCookieBlockedReasonEnum::SameSiteLax); blockedReasons->push_back(Network::SetCookieBlockedReasonEnum::SameSiteLax);
} }
if (status.HasExclusionReason(net::CanonicalCookie::CookieInclusionStatus::
EXCLUDE_SAMESITE_EXTENDED)) {
blockedReasons->push_back(
Network::SetCookieBlockedReasonEnum::SameSiteExtended);
}
if (status.HasExclusionReason( if (status.HasExclusionReason(
net::CanonicalCookie::CookieInclusionStatus:: net::CanonicalCookie::CookieInclusionStatus::
EXCLUDE_SAMESITE_UNSPECIFIED_TREATED_AS_LAX)) { EXCLUDE_SAMESITE_UNSPECIFIED_TREATED_AS_LAX)) {
...@@ -660,11 +655,6 @@ GetProtocolBlockedCookieReason( ...@@ -660,11 +655,6 @@ GetProtocolBlockedCookieReason(
net::CanonicalCookie::CookieInclusionStatus::EXCLUDE_SAMESITE_LAX)) { net::CanonicalCookie::CookieInclusionStatus::EXCLUDE_SAMESITE_LAX)) {
blockedReasons->push_back(Network::CookieBlockedReasonEnum::SameSiteLax); blockedReasons->push_back(Network::CookieBlockedReasonEnum::SameSiteLax);
} }
if (status.HasExclusionReason(net::CanonicalCookie::CookieInclusionStatus::
EXCLUDE_SAMESITE_EXTENDED)) {
blockedReasons->push_back(
Network::CookieBlockedReasonEnum::SameSiteExtended);
}
if (status.HasExclusionReason( if (status.HasExclusionReason(
net::CanonicalCookie::CookieInclusionStatus:: net::CanonicalCookie::CookieInclusionStatus::
EXCLUDE_SAMESITE_UNSPECIFIED_TREATED_AS_LAX)) { EXCLUDE_SAMESITE_UNSPECIFIED_TREATED_AS_LAX)) {
......
...@@ -865,8 +865,6 @@ std::string CanonicalCookie::CookieInclusionStatus::GetDebugString() const { ...@@ -865,8 +865,6 @@ std::string CanonicalCookie::CookieInclusionStatus::GetDebugString() const {
base::StrAppend(&out, {"EXCLUDE_SAMESITE_STRICT, "}); base::StrAppend(&out, {"EXCLUDE_SAMESITE_STRICT, "});
if (HasExclusionReason(EXCLUDE_SAMESITE_LAX)) if (HasExclusionReason(EXCLUDE_SAMESITE_LAX))
base::StrAppend(&out, {"EXCLUDE_SAMESITE_LAX, "}); base::StrAppend(&out, {"EXCLUDE_SAMESITE_LAX, "});
if (HasExclusionReason(EXCLUDE_SAMESITE_EXTENDED))
base::StrAppend(&out, {"EXCLUDE_SAMESITE_EXTENDED, "});
if (HasExclusionReason(EXCLUDE_SAMESITE_UNSPECIFIED_TREATED_AS_LAX)) if (HasExclusionReason(EXCLUDE_SAMESITE_UNSPECIFIED_TREATED_AS_LAX))
base::StrAppend(&out, {"EXCLUDE_SAMESITE_UNSPECIFIED_TREATED_AS_LAX, "}); base::StrAppend(&out, {"EXCLUDE_SAMESITE_UNSPECIFIED_TREATED_AS_LAX, "});
if (HasExclusionReason(EXCLUDE_SAMESITE_NONE_INSECURE)) if (HasExclusionReason(EXCLUDE_SAMESITE_NONE_INSECURE))
......
...@@ -319,9 +319,8 @@ class NET_EXPORT CanonicalCookie::CookieInclusionStatus { ...@@ -319,9 +319,8 @@ class NET_EXPORT CanonicalCookie::CookieInclusionStatus {
EXCLUDE_NOT_ON_PATH = 4, EXCLUDE_NOT_ON_PATH = 4,
EXCLUDE_SAMESITE_STRICT = 5, EXCLUDE_SAMESITE_STRICT = 5,
EXCLUDE_SAMESITE_LAX = 6, EXCLUDE_SAMESITE_LAX = 6,
// TODO(crbug.com/989171): Replace this with FirstPartyLax and // Reserved 7, was EXCLUDE_SAMESITE_EXTENDED.
// FirstPartyStrict.
EXCLUDE_SAMESITE_EXTENDED = 7,
// The following two are used for the SameSiteByDefaultCookies experiment, // The following two are used for the SameSiteByDefaultCookies experiment,
// where if the SameSite attribute is not specified, it will be treated as // where if the SameSite attribute is not specified, it will be treated as
// SameSite=Lax by default. // SameSite=Lax by default.
......
...@@ -4151,8 +4151,6 @@ domain Network ...@@ -4151,8 +4151,6 @@ domain Network
SameSiteStrict SameSiteStrict
# The cookie had the "SameSite=Lax" attribute but came from a cross-origin response. # The cookie had the "SameSite=Lax" attribute but came from a cross-origin response.
SameSiteLax SameSiteLax
# The cookie had the "SameSite=Extended" attribute but came from a cross-origin response.
SameSiteExtended
# The cookie didn't specify a "SameSite" attribute and was defaulted to "SameSite=Lax" and # The cookie didn't specify a "SameSite" attribute and was defaulted to "SameSite=Lax" and
# broke the same rules specified in the SameSiteLax value. # broke the same rules specified in the SameSiteLax value.
SameSiteUnspecifiedTreatedAsLax SameSiteUnspecifiedTreatedAsLax
...@@ -4193,9 +4191,6 @@ domain Network ...@@ -4193,9 +4191,6 @@ domain Network
# The cookie had the "SameSite=Lax" attribute and the request was made on a different site. # The cookie had the "SameSite=Lax" attribute and the request was made on a different site.
# This does not include navigation requests initiated by other sites. # This does not include navigation requests initiated by other sites.
SameSiteLax SameSiteLax
# The cookie had the "SameSite=Extended" attribute and the request was made on a different
# site. The different site is outside of the cookie's trusted first-party set.
SameSiteExtended
# The cookie didn't specify a SameSite attribute when it was stored and was defaulted to # The cookie didn't specify a SameSite attribute when it was stored and was defaulted to
# "SameSite=Lax" and broke the same rules specified in the SameSiteLax value. The cookie had # "SameSite=Lax" and broke the same rules specified in the SameSiteLax value. The cookie had
# to have been set with "SameSite=None" to enable third-party usage. # to have been set with "SameSite=None" to enable third-party usage.
......
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