Backed out changeset 910f7703f9f3 (bug 1555846) for Build bustages. CLOSED TREE
authorDorel Luca <dluca@mozilla.com>
Fri, 31 May 2019 17:24:43 +0300
changeset 476391 3b00cb71291520d263c053cb17f274904536b5a4
parent 476390 9b8cf182a743e50fab37a4a10294ee62e1099a8c
child 476392 0bb05d6474a962bbd56869c4218a36d91ab268a4
push id86828
push userdluca@mozilla.com
push dateFri, 31 May 2019 14:26:06 +0000
treeherderautoland@3b00cb712915 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1555846
milestone69.0a1
backs out910f7703f9f391c2d75cc9e30d958301a0ac346f
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out changeset 910f7703f9f3 (bug 1555846) for Build bustages. CLOSED TREE
netwerk/cookie/nsCookieService.cpp
--- a/netwerk/cookie/nsCookieService.cpp
+++ b/netwerk/cookie/nsCookieService.cpp
@@ -3953,24 +3953,17 @@ CookieStatus nsCookieService::CheckPrefs
     }
   }
 
   // No cookies allowed if this request comes from a tracker, in a 3rd party
   // context, when anti-tracking protection is enabled and when we don't have
   // access to the first-party cookie jar.
   if (aIsForeign && aIsTrackingResource && !aFirstPartyStorageAccessGranted &&
       aCookieSettings->GetRejectThirdPartyTrackers()) {
-    // Explicitly pass nsIWebProgressListener::STATE_COOKIES_BLOCKED_TRACKER
-    // here to ensure that we are testing the partitioning configuration only
-    // for the nsICookieService::BEHAVIOR_REJECT_TRACKER configuration.
-    // When partitioning for BEHAVIOR_REJECT_TRACKER_AND_PARTITION_FOREIGN, we
-    // don't want to give a free pass to tracker cookies here!
-    if (StoragePartitioningEnabled(
-            nsIWebProgressListener::STATE_COOKIES_BLOCKED_TRACKER,
-            aCookieSettings)) {
+    if (StoragePartitioningEnabled(aInputRejectedReason, aCookieSettings)) {
       MOZ_ASSERT(!aOriginAttrs.mFirstPartyDomain.IsEmpty(),
                  "We must have a StoragePrincipal here!");
       return STATUS_ACCEPTED;
     }
 
     COOKIE_LOGFAILURE(aCookieHeader.IsVoid() ? GET_COOKIE : SET_COOKIE,
                       aHostURI, aCookieHeader,
                       "cookies are disabled in trackers");