Back out 285204b60e94 and f401b820cd6a (bug 967693) to turn HTTP cache v2 off to investigate the effect on the influx of failed tests

CLOSED TREE
This commit is contained in:
Phil Ringnalda 2014-02-05 22:58:37 -08:00
parent 6dabf48731
commit 33ffca7f1b
3 changed files with 1 additions and 18 deletions

View File

@ -1361,7 +1361,3 @@ pref("identity.fxaccounts.settings.uri", "https://accounts.firefox.com/settings"
// The URL of the Firefox Accounts auth server backend
pref("identity.fxaccounts.auth.uri", "https://api.accounts.firefox.com/v1");
// Temporarily turn the new http cache v2 on for Desktop Firefox only
pref("browser.cache.use_new_backend_temp", true);

View File

@ -48,11 +48,8 @@ function performTest() {
is(gFrames.selectedIndex, 1,
"Newest frame should be selected by default.");
/*
DISABLED FOR CACHE2 FAILURES, bug 948566
is(gClassicFrames.selectedIndex, 0,
"Newest frame should be selected by default in the mirrored view.");
*/
isnot(gFrames.selectedIndex, 0,
"Oldest frame should not be selected.");

View File

@ -25,9 +25,6 @@ uint32_t CacheObserver::sMemoryLimit = kDefaultMemoryLimit;
static uint32_t const kDefaultUseNewCache = 0; // Don't 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;
@ -105,8 +102,6 @@ CacheObserver::AttachToPreferences()
mozilla::Preferences::AddUintVarCache(
&sUseNewCache, "browser.cache.use_new_backend", kDefaultUseNewCache);
mozilla::Preferences::AddBoolVarCache(
&sUseNewCacheTemp, "browser.cache.use_new_backend_temp", false);
mozilla::Preferences::AddBoolVarCache(
&sUseDiskCache, "browser.cache.disk.enable", kDefaultUseDiskCache);
@ -182,12 +177,7 @@ void CacheObserver::SchduleAutoDelete()
// static
bool const CacheObserver::UseNewCache()
{
uint32_t useNewCache = sUseNewCache;
if (sUseNewCacheTemp)
useNewCache = 1;
switch (useNewCache) {
switch (sUseNewCache) {
case 0: // use the old cache backend
return false;