summaryrefslogtreecommitdiff
path: root/netwerk/cache2/CacheObserver.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'netwerk/cache2/CacheObserver.cpp')
-rw-r--r--netwerk/cache2/CacheObserver.cpp9
1 files changed, 1 insertions, 8 deletions
diff --git a/netwerk/cache2/CacheObserver.cpp b/netwerk/cache2/CacheObserver.cpp
index 1eb76e8c5b..6b6d893957 100644
--- a/netwerk/cache2/CacheObserver.cpp
+++ b/netwerk/cache2/CacheObserver.cpp
@@ -26,8 +26,6 @@ CacheObserver* CacheObserver::sSelf = nullptr;
static uint32_t const kDefaultUseNewCache = 1; // Use the new cache by default
uint32_t CacheObserver::sUseNewCache = kDefaultUseNewCache;
-static bool sUseNewCacheTemp = false; // Temp trigger to not lose early adopters
-
static int32_t const kAutoDeleteCacheVersion = -1; // Auto-delete off by default
static int32_t sAutoDeleteCacheVersion = kAutoDeleteCacheVersion;
@@ -154,9 +152,7 @@ CacheObserver::AttachToPreferences()
"browser.cache.auto_delete_cache_version", kAutoDeleteCacheVersion);
mozilla::Preferences::AddUintVarCache(
- &sUseNewCache, "browser.cache.use_new_backend", kDefaultUseNewCache);
- mozilla::Preferences::AddBoolVarCache(
- &sUseNewCacheTemp, "browser.cache.use_new_backend_temp", false);
+ &sUseNewCache, "browser.cache.backend", kDefaultUseNewCache);
mozilla::Preferences::AddBoolVarCache(
&sUseDiskCache, "browser.cache.disk.enable", kDefaultUseDiskCache);
@@ -297,9 +293,6 @@ bool CacheObserver::UseNewCache()
{
uint32_t useNewCache = sUseNewCache;
- if (sUseNewCacheTemp)
- useNewCache = 1;
-
switch (useNewCache) {
case 0: // use the old cache backend
return false;