Backed out changeset 3a328e80b02c (bug 1510860) for failures e.g.: do…

…m/tests/mochitest/general/test_storagePermissionsLimitForeign.html CLOSED TREE
mozilla-spidermonkey · Dec 21, 2018 · e068a75 · e068a75
1 parent bf18da9
commit e068a75
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 74 deletions.
diff --git a/netwerk/cookie/nsCookieService.cpp b/netwerk/cookie/nsCookieService.cpp
@@ -1998,8 +1998,8 @@ nsresult nsCookieService::GetCookieStringCommon(nsIURI *aHostURI,
     // Check first-party storage access even for non-tracking resources, since
     // we will need the result when computing the access rights for the reject
     // foreign cookie behavior mode.
-    if (AntiTrackingCommon::IsFirstPartyStorageAccessGrantedFor(
-            httpChannel, aHostURI, nullptr)) {
+    if (isForeign && AntiTrackingCommon::IsFirstPartyStorageAccessGrantedFor(
+                         httpChannel, aHostURI, nullptr)) {
       firstPartyStorageAccessGranted = true;
     }
   }
@@ -2099,8 +2099,8 @@ nsresult nsCookieService::SetCookieStringCommon(nsIURI *aHostURI,
     // Check first-party storage access even for non-tracking resources, since
     // we will need the result when computing the access rights for the reject
     // foreign cookie behavior mode.
-    if (AntiTrackingCommon::IsFirstPartyStorageAccessGrantedFor(
-            httpChannel, aHostURI, nullptr)) {
+    if (isForeign && AntiTrackingCommon::IsFirstPartyStorageAccessGrantedFor(
+                         httpChannel, aHostURI, nullptr)) {
       firstPartyStorageAccessGranted = true;
     }
   }

diff --git a/toolkit/components/antitracking/test/browser/browser.ini b/toolkit/components/antitracking/test/browser/browser.ini
@@ -41,7 +41,6 @@ skip-if = (os == "win" && os_version == "6.1" && bits == 32 && !debug) # Bug 149
 [browser_blockingNoOpener.js]
 [browser_doublyNestedTracker.js]
 [browser_existingCookiesForSubresources.js]
-[browser_firstPartyCookieRejectionHonoursAllowList.js]
 [browser_imageCache4.js]
 [browser_imageCache4-1.js]
 [browser_imageCache4-2.js]

diff --git a/...components/antitracking/test/browser/browser_firstPartyCookieRejectionHonoursAllowList.js b/...components/antitracking/test/browser/browser_firstPartyCookieRejectionHonoursAllowList.js