Bug 1826293 - Remove pref privacy.partition.network_state.ws_connection_queue. r=hpeuckmann,necko-reviewers,valentin

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

Author: Trikolon

modules/libpref/init/StaticPrefList.yaml

@@ -13249,12 +13249,6 @@
   value: false
   mirror: always
 
-#  Partition the websocket pending connection queue by OriginAttributes.
-- name: privacy.partition.network_state.ws_connection_queue
-  type: RelaxedAtomicBool
-  value: true
-  mirror: always
-
 # Partition the service workers unconditionally when dFPI is enabled.
 - name: privacy.partition.serviceWorkers
   type: RelaxedAtomicBool

netwerk/protocol/websocket/WebSocketChannel.cpp

@@ -518,10 +518,8 @@ class nsWSAdmissionManager {
 
   int32_t IndexOf(nsCString& aAddress, nsCString& aOriginSuffix) {
     for (uint32_t i = 0; i < mQueue.Length(); i++) {
-      bool isPartitioned =
-          (StaticPrefs::privacy_partition_network_state() ||
-           StaticPrefs::privacy_firstparty_isolate()) &&
-          StaticPrefs::privacy_partition_network_state_ws_connection_queue();
+      bool isPartitioned = StaticPrefs::privacy_partition_network_state() ||
+                           StaticPrefs::privacy_firstparty_isolate();
       if (aAddress == (mQueue[i])->mAddress &&
           (!isPartitioned || aOriginSuffix == (mQueue[i])->mOriginSuffix)) {
         return i;

toolkit/components/antitracking/test/browser/browser_staticPartition_websocket.js

@@ -81,14 +81,8 @@ function connect(browsingContext, host, protocol) {
 // By observing the order of the handshakes we can ensure that the queue
 // partitioning is working correctly.
 async function runTest(partitioned) {
-  let prefs = [
-    ["privacy.partition.network_state.ws_connection_queue", partitioned],
-  ];
-  if (partitioned) {
-    prefs.push(["privacy.partition.network_state", partitioned]);
-  }
   await SpecialPowers.pushPrefEnv({
-    set: prefs,
+    set: [["privacy.partition.network_state", partitioned]],
   });
 
   let tabA = BrowserTestUtils.addTab(gBrowser, FIRST_PARTY_A);