Merge branch 'redwood' into 28.9-platform

1 files changed, 0 insertions, 10 deletions

diff --git a/netwerk/cache2/CacheFileIOManager.h b/netwerk/cache2/CacheFileIOManager.h
index 5ac812da5..8a51b5a0e 100644
--- a/netwerk/cache2/CacheFileIOManager.h
+++ b/netwerk/cache2/CacheFileIOManager.h
@@ -346,9 +346,6 @@ public:
   };
 
   static void GetCacheDirectory(nsIFile** result);
-#if defined(MOZ_WIDGET_ANDROID)
-  static void GetProfilelessCacheDirectory(nsIFile** result);
-#endif
 
   // Calls synchronously OnEntryInfo for an entry with the given hash.
   // Tries to find an existing entry in the service hashtables first, if not
@@ -459,13 +456,6 @@ private:
   bool                                 mShuttingDown;
   RefPtr<CacheIOThread>                mIOThread;
   nsCOMPtr<nsIFile>                    mCacheDirectory;
-#if defined(MOZ_WIDGET_ANDROID)
-  // On Android we add the active profile directory name between the path
-  // and the 'cache2' leaf name.  However, to delete any leftover data from
-  // times before we were doing it, we still need to access the directory
-  // w/o the profile name in the path.  Here it is stored.
-  nsCOMPtr<nsIFile>                    mCacheProfilelessDirectory;
-#endif
   bool                                 mTreeCreated;
   bool                                 mTreeCreationFailed;
   CacheFileHandles                     mHandles;