Commit 4c6ace6a authored May 29, 2019 by Andrea Marchesini

Bug 1551798 - Rename nsICookie2.SAMESITE_UNSET to nsICookie2.SAMESITE_NONE, r=Ehsan

Differential Revision: https://phabricator.services.mozilla.com/D31214

--HG--
extra : moz-landing-system : lando

parent 046bb46c

browser/base/content/test/sanitize/browser_cookiePermission_subDomains.js

+4 −4

Original line number	Original line	Diff line number	Diff line
	@@ -22,7 +22,7 @@ add_task(async function subDomains() {

	Services.cookies.add(uriA.host, "/test", "a", "b",		Services.cookies.add(uriA.host, "/test", "a", "b",
	false, false, false, Date.now() + 24000 * 60 * 60, {},		false, false, false, Date.now() + 24000 * 60 * 60, {},
	Ci.nsICookie2.SAMESITE_UNSET);		Ci.nsICookie2.SAMESITE_NONE);

	await createIndexedDB(uriA.host, {});		await createIndexedDB(uriA.host, {});

	@@ -31,7 +31,7 @@ add_task(async function subDomains() {

	Services.cookies.add(uriB.host, "/test", "c", "d",		Services.cookies.add(uriB.host, "/test", "c", "d",
	false, false, false, Date.now() + 24000 * 60 * 60, {},		false, false, false, Date.now() + 24000 * 60 * 60, {},
	Ci.nsICookie2.SAMESITE_UNSET);		Ci.nsICookie2.SAMESITE_NONE);

	await createIndexedDB(uriB.host, {});		await createIndexedDB(uriB.host, {});

	@@ -76,7 +76,7 @@ add_task(async function subDomains() {

	Services.cookies.add(uriA.host, "/test", "a", "b",		Services.cookies.add(uriA.host, "/test", "a", "b",
	false, false, false, Date.now() + 24000 * 60 * 60, {},		false, false, false, Date.now() + 24000 * 60 * 60, {},
	Ci.nsICookie2.SAMESITE_UNSET);		Ci.nsICookie2.SAMESITE_NONE);

	await createIndexedDB(uriA.host, {});		await createIndexedDB(uriA.host, {});

	@@ -84,7 +84,7 @@ add_task(async function subDomains() {

	Services.cookies.add(uriB.host, "/test", "c", "d",		Services.cookies.add(uriB.host, "/test", "c", "d",
	false, false, false, Date.now() + 24000 * 60 * 60, {},		false, false, false, Date.now() + 24000 * 60 * 60, {},
	Ci.nsICookie2.SAMESITE_UNSET);		Ci.nsICookie2.SAMESITE_NONE);

	await createIndexedDB(uriB.host, {});		await createIndexedDB(uriB.host, {});

browser/base/content/test/sanitize/head.js

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -34,13 +34,13 @@ function checkIndexedDB(host, originAttributes) {
	function createHostCookie(host, originAttributes) {		function createHostCookie(host, originAttributes) {
	Services.cookies.add(host, "/test", "foo", "bar",		Services.cookies.add(host, "/test", "foo", "bar",
	false, false, false, Date.now() + 24000 * 60 * 60, originAttributes,		false, false, false, Date.now() + 24000 * 60 * 60, originAttributes,
	Ci.nsICookie2.SAMESITE_UNSET);		Ci.nsICookie2.SAMESITE_NONE);
	}		}

	function createDomainCookie(host, originAttributes) {		function createDomainCookie(host, originAttributes) {
	Services.cookies.add("." + host, "/test", "foo", "bar",		Services.cookies.add("." + host, "/test", "foo", "bar",
	false, false, false, Date.now() + 24000 * 60 * 60, originAttributes,		false, false, false, Date.now() + 24000 * 60 * 60, originAttributes,
	Ci.nsICookie2.SAMESITE_UNSET);		Ci.nsICookie2.SAMESITE_NONE);
	}		}

	function checkCookie(host, originAttributes) {		function checkCookie(host, originAttributes) {

browser/components/enterprisepolicies/tests/xpcshell/test_clear_blocked_cookies.js

+5 −5

Original line number	Original line	Diff line number	Diff line
	@@ -7,11 +7,11 @@ const ORIGIN_DOMAIN = "browser_policy_clear_blocked_cookies.org";

	add_task(async function setup() {		add_task(async function setup() {
	const expiry = Date.now() + 24 * 60 * 60;		const expiry = Date.now() + 24 * 60 * 60;
	Services.cookies.add(HOSTNAME_DOMAIN, "/", "secure", "true", true, false, false, expiry, {}, Ci.nsICookie2.SAMESITE_UNSET);		Services.cookies.add(HOSTNAME_DOMAIN, "/", "secure", "true", true, false, false, expiry, {}, Ci.nsICookie2.SAMESITE_NONE);
	Services.cookies.add(HOSTNAME_DOMAIN, "/", "insecure", "true", false, false, false, expiry, {}, Ci.nsICookie2.SAMESITE_UNSET);		Services.cookies.add(HOSTNAME_DOMAIN, "/", "insecure", "true", false, false, false, expiry, {}, Ci.nsICookie2.SAMESITE_NONE);
	Services.cookies.add(ORIGIN_DOMAIN, "/", "secure", "true", true, false, false, expiry, {}, Ci.nsICookie2.SAMESITE_UNSET);		Services.cookies.add(ORIGIN_DOMAIN, "/", "secure", "true", true, false, false, expiry, {}, Ci.nsICookie2.SAMESITE_NONE);
	Services.cookies.add(ORIGIN_DOMAIN, "/", "insecure", "true", false, false, false, expiry, {}, Ci.nsICookie2.SAMESITE_UNSET);		Services.cookies.add(ORIGIN_DOMAIN, "/", "insecure", "true", false, false, false, expiry, {}, Ci.nsICookie2.SAMESITE_NONE);
	Services.cookies.add("example.net", "/", "secure", "true", true, false, false, expiry, {}, Ci.nsICookie2.SAMESITE_UNSET);		Services.cookies.add("example.net", "/", "secure", "true", true, false, false, expiry, {}, Ci.nsICookie2.SAMESITE_NONE);
	await setupPolicyEngineWithJson({		await setupPolicyEngineWithJson({
	"policies": {		"policies": {
	"Cookies": {		"Cookies": {

browser/components/extensions/test/xpcshell/test_ext_browsingData_cookies_cache.js

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -24,7 +24,7 @@ const COOKIE_ORG = {
	let since, oldCookie;		let since, oldCookie;

	function addCookie(cookie) {		function addCookie(cookie) {
	Services.cookies.add(cookie.host, cookie.path, cookie.name, "test", false, false, false, Date.now() / 1000 + 10000, {}, Ci.nsICookie2.SAMESITE_UNSET);		Services.cookies.add(cookie.host, cookie.path, cookie.name, "test", false, false, false, Date.now() / 1000 + 10000, {}, Ci.nsICookie2.SAMESITE_NONE);
	ok(Services.cookies.cookieExists(cookie.host, cookie.path, cookie.name, {}), `Cookie ${cookie.name} was created.`);		ok(Services.cookies.cookieExists(cookie.host, cookie.path, cookie.name, {}), `Cookie ${cookie.name} was created.`);
	}		}

browser/components/migration/ChromeProfileMigrator.jsm

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -336,7 +336,7 @@ async function GetCookiesResource(aProfileFolder) {
	false,		false,
	parseInt(expiresUtc),		parseInt(expiresUtc),
	{},		{},
	Ci.nsICookie2.SAMESITE_UNSET);		Ci.nsICookie2.SAMESITE_NONE);
	} catch (e) {		} catch (e) {
	Cu.reportError(e);		Cu.reportError(e);
	}		}