From 84818be343c237756f5ca9c3f26e1ca381fdc4e2 Mon Sep 17 00:00:00 2001
From: wolfbeast <mcwerewolf@wolfbeast.com>
Date: Tue, 14 Jan 2020 15:07:15 +0100
Subject: [PATCH] No issue - Remove unused
 network.http.bypass-cachelock-threshold pref.

---
 modules/libpref/init/all.js                               | 8 --------
 .../marionette/client/marionette_driver/geckoinstance.py  | 2 --
 testing/profiles/prefs_general.js                         | 3 ---
 3 files changed, 13 deletions(-)

diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js
index f52d768a99..8e1f1ff406 100644
--- a/modules/libpref/init/all.js
+++ b/modules/libpref/init/all.js
@@ -1572,14 +1572,6 @@ pref("network.http.rendering-critical-requests-prioritization", true);
 // IPv6 connectivity.
 pref("network.http.fast-fallback-to-IPv4", true);
 
-// The maximum amount of time the cache session lock can be held
-// before a new transaction bypasses the cache. In milliseconds.
-#ifdef RELEASE_OR_BETA
-pref("network.http.bypass-cachelock-threshold", 200000);
-#else
-pref("network.http.bypass-cachelock-threshold", 250);
-#endif
-
 // Try and use SPDY when using SSL
 pref("network.http.spdy.enabled", true);
 pref("network.http.spdy.enabled.http2", true);
diff --git a/testing/marionette/client/marionette_driver/geckoinstance.py b/testing/marionette/client/marionette_driver/geckoinstance.py
index 174168ed23..c59cc2acea 100644
--- a/testing/marionette/client/marionette_driver/geckoinstance.py
+++ b/testing/marionette/client/marionette_driver/geckoinstance.py
@@ -77,8 +77,6 @@ class GeckoInstance(object):
         "marionette.defaultPrefs.enabled": True,
         "media.volume_scale": "0.01",
 
-        # Make sure the disk cache doesn't get auto disabled
-        "network.http.bypass-cachelock-threshold": 200000,
         # Do not prompt for temporary redirects
         "network.http.prompt-temp-redirect": False,
         # Disable speculative connections so they aren"t reported as leaking when they"re
diff --git a/testing/profiles/prefs_general.js b/testing/profiles/prefs_general.js
index 3ec41b385e..960cbda15a 100644
--- a/testing/profiles/prefs_general.js
+++ b/testing/profiles/prefs_general.js
@@ -197,9 +197,6 @@ user_pref("dom.mozContacts.enabled", true);
 // Enable mozSettings
 user_pref("dom.mozSettings.enabled", true);
 
-// Make sure the disk cache doesn't get auto disabled
-user_pref("network.http.bypass-cachelock-threshold", 200000);
-
 // Enable Gamepad
 user_pref("dom.gamepad.enabled", true);
 user_pref("dom.gamepad.non_standard_events.enabled", true);