Remove pref confusion around cache v2

- Renames browser.cache.use_new_backend to browser.cache.backend
- Sets browser.cache.backend to 1 (use cache v2)
- Removes browser.cache.use_new_backend_temp

1 files changed, 1 insertions, 8 deletions

diff --git a/netwerk/cache2/CacheObserver.cpp b/netwerk/cache2/CacheObserver.cpp
index 7a2177710..48092f243 100644
--- a/netwerk/cache2/CacheObserver.cpp
+++ b/netwerk/cache2/CacheObserver.cpp
@@ -25,8 +25,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;
 
@@ -137,9 +135,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);
@@ -277,9 +273,6 @@ bool const CacheObserver::UseNewCache()
 {
   uint32_t useNewCache = sUseNewCache;
 
-  if (sUseNewCacheTemp)
-    useNewCache = 1;
-
   switch (useNewCache) {
     case 0: // use the old cache backend
       return false;