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 { ...@@ -1163,7 +1163,7 @@ public class CookieManagerTest {
+ " await window.cookieStore.set(" + " await window.cookieStore.set("
+ " " + name + ", " + value + ", " + " " + name + ", " + value + ", "
+ " { expires: Date.now() + 3600*1000," + " { expires: Date.now() + 3600*1000,"
+ " sameSite: 'unrestricted' });" + " sameSite: 'none' });"
+ "} finally {" + "} finally {"
+ " " + finallyAction + "}\n"; + " " + finallyAction + "}\n";
} }
......
...@@ -311,7 +311,7 @@ class CookieSettingsTest ...@@ -311,7 +311,7 @@ class CookieSettingsTest
" await window.cookieStore.set(" " await window.cookieStore.set("
" 'name', 'Good', " " 'name', 'Good', "
" { expires: Date.now() + 3600*1000," " { expires: Date.now() + 3600*1000,"
" sameSite: 'unrestricted' });" " sameSite: 'none' });"
" window.domAutomationController.send(true);" " window.domAutomationController.send(true);"
"}" "}"
"doSet()"); "doSet()");
...@@ -848,7 +848,7 @@ IN_PROC_BROWSER_TEST_F(ContentSettingsWorkerModulesBrowserTest, CookieStore) { ...@@ -848,7 +848,7 @@ IN_PROC_BROWSER_TEST_F(ContentSettingsWorkerModulesBrowserTest, CookieStore) {
await cookieStore.set( await cookieStore.set(
e.data, 'value', e.data, 'value',
{ expires: Date.now() + 3600*1000, { expires: Date.now() + 3600*1000,
sameSite: 'unrestricted' }); sameSite: 'none' });
} finally { } finally {
e.source.postMessage('set executed for ' + e.data); e.source.postMessage('set executed for ' + e.data);
} }
......
...@@ -56,7 +56,7 @@ String ToCookieListItemSameSite(network::mojom::CookieSameSite same_site) { ...@@ -56,7 +56,7 @@ String ToCookieListItemSameSite(network::mojom::CookieSameSite same_site) {
case network::mojom::CookieSameSite::LAX_MODE: case network::mojom::CookieSameSite::LAX_MODE:
return "lax"; return "lax";
case network::mojom::CookieSameSite::NO_RESTRICTION: case network::mojom::CookieSameSite::NO_RESTRICTION:
return "unrestricted"; return "none";
case network::mojom::CookieSameSite::UNSPECIFIED: case network::mojom::CookieSameSite::UNSPECIFIED:
return "unspecified"; return "unspecified";
} }
......
...@@ -138,7 +138,7 @@ base::Optional<CanonicalCookie> ToCanonicalCookie( ...@@ -138,7 +138,7 @@ base::Optional<CanonicalCookie> ToCanonicalCookie(
} else if (options->sameSite() == "lax") { } else if (options->sameSite() == "lax") {
same_site = network::mojom::CookieSameSite::LAX_MODE; same_site = network::mojom::CookieSameSite::LAX_MODE;
} else { } else {
DCHECK_EQ(options->sameSite(), "unrestricted"); DCHECK_EQ(options->sameSite(), "none");
same_site = network::mojom::CookieSameSite::NO_RESTRICTION; same_site = network::mojom::CookieSameSite::NO_RESTRICTION;
} }
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
enum CookieSameSite { enum CookieSameSite {
"strict", "strict",
"lax", "lax",
"unrestricted" "none"
}; };
dictionary CookieStoreSetOptions { dictionary CookieStoreSetOptions {
......
...@@ -187,7 +187,7 @@ promise_test(async testCase => { ...@@ -187,7 +187,7 @@ promise_test(async testCase => {
assert_array_equals(Object.keys(cookie).sort(), kCookieListItemKeys); assert_array_equals(Object.keys(cookie).sort(), kCookieListItemKeys);
}, 'CookieListItem - cookieStore.set with secure set to false'); }, 'CookieListItem - cookieStore.set with secure set to false');
['strict', 'lax', 'unrestricted'].forEach(sameSiteValue => { ['strict', 'lax', 'none'].forEach(sameSiteValue => {
promise_test(async testCase => { promise_test(async testCase => {
await cookieStore.delete('cookie-name'); await cookieStore.delete('cookie-name');
......
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