From e757f73f621dd6cd814abd9f4bfeaa1a64b7e882 Mon Sep 17 00:00:00 2001
From: Josh Matthews <josh@joshmatthews.net>
Date: Sun, 24 Oct 2010 13:34:44 -0400
Subject: [PATCH] Bug 559714 - Backout bug 595293. Followup to the rest of bug
 559714 landing. r=jduell a=blocking-fennec

--HG--
extra : rebase_source : 52a1040caf875007804c5b63a1e46938cd47fa39
---
 netwerk/cache/nsCacheService.cpp | 19 -------------------
 1 file changed, 19 deletions(-)

diff --git a/netwerk/cache/nsCacheService.cpp b/netwerk/cache/nsCacheService.cpp
index aaa9cfde4d7..ccd839e8765 100644
--- a/netwerk/cache/nsCacheService.cpp
+++ b/netwerk/cache/nsCacheService.cpp
@@ -76,10 +76,6 @@
 
 #include "mozilla/FunctionTimer.h"
 
-#ifdef MOZ_IPC
-#include "mozilla/net/NeckoCommon.h"
-#endif
-
 /******************************************************************************
  * nsCacheProfilePrefObserver
  *****************************************************************************/
@@ -793,14 +789,6 @@ nsCacheService::DispatchToCacheIOThread(nsIRunnable* event)
 PRBool
 nsCacheProfilePrefObserver::DiskCacheEnabled()
 {
-#ifdef MOZ_IPC
-    // Bad Things (tm) are likely to happen if child and parent both write to
-    // disk cache.  
-    // - TODO: remove once we turn off caching entirely in child (bug 559714)
-    if (mozilla::net::IsNeckoChild())
-        return PR_FALSE;
-#endif
-
     if ((mDiskCacheCapacity == 0) || (!mDiskCacheParentDirectory))  return PR_FALSE;
     return mDiskCacheEnabled;
 }
@@ -858,13 +846,6 @@ nsCacheProfilePrefObserver::MemoryCacheEnabled()
 PRInt32
 nsCacheProfilePrefObserver::MemoryCacheCapacity()
 {
-#ifdef MOZ_IPC
-    // For now use small memory cache (1 MB) on child, just for FTP/wyciwyg
-    // - TODO: remove once we turn off caching entirely in child (bug 559714)
-    if (mozilla::net::IsNeckoChild())
-        return 1024; 
-#endif
-
     PRInt32 capacity = mMemoryCacheCapacity;
     if (capacity >= 0) {
         CACHE_LOG_DEBUG(("Memory cache capacity forced to %d\n", capacity));