Commit f6634222 authored by Ayu Ishii's avatar Ayu Ishii Committed by Commit Bot

CookieStore: Rename cookie sameSite 'unrestricted' to 'none'

Bug: 1045114
Change-Id: Ifd1a1cac094daab05e2d2330d393c3bdfc0d75b2
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2020425Reviewed-by: default avatarVictor Costan <pwnall@chromium.org>
Reviewed-by: default avatarBo <boliu@chromium.org>
Reviewed-by: default avatarBalazs Engedy <engedy@chromium.org>
Commit-Queue: Ayu Ishii <ayui@chromium.org>
Cr-Commit-Position: refs/heads/master@{#736987}
parent 8fd5c7c7
......@@ -1163,7 +1163,7 @@ public class CookieManagerTest {
+ " await window.cookieStore.set("
+ " " + name + ", " + value + ", "
+ " { expires: Date.now() + 3600*1000,"
+ " sameSite: 'unrestricted' });"
+ " sameSite: 'none' });"
+ "} finally {"
+ " " + finallyAction + "}\n";
}
......
......@@ -311,7 +311,7 @@ class CookieSettingsTest
" await window.cookieStore.set("
" 'name', 'Good', "
" { expires: Date.now() + 3600*1000,"
" sameSite: 'unrestricted' });"
" sameSite: 'none' });"
" window.domAutomationController.send(true);"
"}"
"doSet()");
......@@ -848,7 +848,7 @@ IN_PROC_BROWSER_TEST_F(ContentSettingsWorkerModulesBrowserTest, CookieStore) {
await cookieStore.set(
e.data, 'value',
{ expires: Date.now() + 3600*1000,
sameSite: 'unrestricted' });
sameSite: 'none' });
} finally {
e.source.postMessage('set executed for ' + e.data);
}
......
......@@ -56,7 +56,7 @@ String ToCookieListItemSameSite(network::mojom::CookieSameSite same_site) {
case network::mojom::CookieSameSite::LAX_MODE:
return "lax";
case network::mojom::CookieSameSite::NO_RESTRICTION:
return "unrestricted";
return "none";
case network::mojom::CookieSameSite::UNSPECIFIED:
return "unspecified";
}
......
......@@ -138,7 +138,7 @@ base::Optional<CanonicalCookie> ToCanonicalCookie(
} else if (options->sameSite() == "lax") {
same_site = network::mojom::CookieSameSite::LAX_MODE;
} else {
DCHECK_EQ(options->sameSite(), "unrestricted");
DCHECK_EQ(options->sameSite(), "none");
same_site = network::mojom::CookieSameSite::NO_RESTRICTION;
}
......
......@@ -7,7 +7,7 @@
enum CookieSameSite {
"strict",
"lax",
"unrestricted"
"none"
};
dictionary CookieStoreSetOptions {
......
......@@ -187,7 +187,7 @@ promise_test(async testCase => {
assert_array_equals(Object.keys(cookie).sort(), kCookieListItemKeys);
}, 'CookieListItem - cookieStore.set with secure set to false');
['strict', 'lax', 'unrestricted'].forEach(sameSiteValue => {
['strict', 'lax', 'none'].forEach(sameSiteValue => {
promise_test(async testCase => {
await cookieStore.delete('cookie-name');
......@@ -226,4 +226,4 @@ promise_test(async testCase => {
assert_array_equals(Object.keys(cookie).sort(), kCookieListItemKeys);
}, 'CookieListItem - cookieStore.set with positional name and value and ' +
`sameSite set to ${sameSiteValue}`);
});
\ No newline at end of file
});
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