From 5a3296d55ad483f99109e78e9933ae147e876d02 Mon Sep 17 00:00:00 2001
From: Dorel Luca <dluca@mozilla.com>
Date: Fri, 31 May 2019 17:24:43 +0300
Subject: [PATCH] Backed out changeset 910f7703f9f3 (bug 1555846) for Build
 bustages. CLOSED TREE

---
 netwerk/cookie/nsCookieService.cpp | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/netwerk/cookie/nsCookieService.cpp b/netwerk/cookie/nsCookieService.cpp
index 8dfff8c797a5..a2e6e0f56950 100644
--- a/netwerk/cookie/nsCookieService.cpp
+++ b/netwerk/cookie/nsCookieService.cpp
@@ -3958,14 +3958,7 @@ CookieStatus nsCookieService::CheckPrefs(
   // 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;