Bug 1361435 - Remove references to unused pref network.http.bypass-cachelock-threshold, r=mcmanus

Removes references to now unused pref that was added in bug 868441 and removed in bugs 913807 and 1054572. It also removes some leftovers from http channel which have not been removed in those 2 bugs.

addon-sdk/source/python-lib/cuddlefish/prefs.py

@@ -216,8 +216,6 @@ DEFAULT_TEST_PREFS = {
     'layout.css.report_errors': True,
     'layout.css.grid.enabled': True,
     'layout.spammy_warnings.enabled': False,
-    # Make sure the disk cache doesn't get auto disabled
-    'network.http.bypass-cachelock-threshold': 200000,
     # Always use network provider for geolocation tests
     # so we bypass the OSX dialog raised by the corelocation provider
     'geo.provider.testing': True,

addon-sdk/source/test/preferences/test.json

@@ -31,7 +31,6 @@
   "layout.css.report_errors": true,
   "layout.css.grid.enabled": true,
   "layout.spammy_warnings.enabled": false,
-  "network.http.bypass-cachelock-threshold": 200000,
   "geo.provider.testing": true,
   "browser.pagethumbnails.capturing_disabled": true,
   "browser.download.panel.shown": true,

modules/libpref/init/all.js

@@ -1600,14 +1600,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);

netwerk/protocol/http/nsHttpHandler.h

@@ -353,12 +353,6 @@ public:
     // returns true in between Init and Shutdown states
     bool Active() { return mHandlerActive; }
 
-    // When the disk cache is responding slowly its use is suppressed
-    // for 1 minute for most requests. Callable from main thread only.
-    TimeStamp GetCacheSkippedUntil() { return mCacheSkippedUntil; }
-    void SetCacheSkippedUntil(TimeStamp arg) { mCacheSkippedUntil = arg; }
-    void ClearCacheSkippedUntil() { mCacheSkippedUntil = TimeStamp(); }
-
     nsIRequestContextService *GetRequestContextService()
     {
         return mRequestContextService.get();
@@ -560,10 +554,6 @@ private:
     // while those elements load.
     bool           mCriticalRequestPrioritization;
 
-    // When the disk cache is responding slowly its use is suppressed
-    // for 1 minute for most requests.
-    TimeStamp      mCacheSkippedUntil;
-
     // TCP Keepalive configuration values.
 
     // True if TCP keepalive is enabled for short-lived conns.

testing/marionette/client/marionette_driver/geckoinstance.py

@@ -82,8 +82,6 @@ class GeckoInstance(object):
 
         "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

testing/marionette/server.js

@@ -222,9 +222,6 @@ const RECOMMENDED_PREFS = new Map([
   // Show chrome errors and warnings in the error console
   ["javascript.options.showInConsole", true],
 
-  // 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],
 

testing/profiles/prefs_general.js

@@ -198,9 +198,6 @@ user_pref("layout.spammy_warnings.enabled", false);
 user_pref("media.mediasource.mp4.enabled", true);
 user_pref("media.mediasource.webm.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);