[not part of build] I changed all the declaration of all PRInt32 storagePolicy variables to nsCacheStoragePolicy.

netwerk/cache/public/nsICacheService.idl

@@ -24,6 +24,7 @@
  */
 
 #include "nsISupports.idl"
+#include "nsICache.idl"
 
 interface nsISimpleEnumerator;
 interface nsICacheListener;
@@ -63,9 +64,9 @@ interface nsICacheService : nsISupports
      *   based cache entry can only have a storage policy of STORE_IN_MEMORY.
      * @return new cache session.
      */
-    nsICacheSession createSession(in string  clientID,
-                                  in long    storagePolicy,
-                                  in boolean streamBased);
+    nsICacheSession createSession(in string                 clientID,
+                                  in nsCacheStoragePolicy   storagePolicy,
+                                  in boolean                streamBased);
 
     /*
      * Visit entries stored in the cache.  Used to implement about:cache.

netwerk/cache/src/nsCacheRequest.h

@@ -53,8 +53,11 @@ private:
         PR_INIT_CLIST(&mListLink);
     }
     
-    virtual ~nsCacheRequest();
-    
+    virtual ~nsCacheRequest()
+    {
+        delete mKey;
+        // XXX need to do anything with mListLink?
+    }
     
 
     PRCList*                GetListNode(void)    { return &mListLink;   }

netwerk/cache/src/nsCacheService.cpp

@@ -26,6 +26,7 @@
 #include "nsCacheEntry.h"
 #include "nsCacheEntryDescriptor.h"
 #include "nsCacheDevice.h"
+#include "nsCacheRequest.h"
 #include "nsMemoryCacheDevice.h"
 #include "nsAutoLock.h"
 #include "nsVoidArray.h"
@@ -149,10 +150,10 @@ nsCacheService::Create(nsISupports* aOuter, const nsIID& aIID, void* *aResult)
 
 
 NS_IMETHODIMP
-nsCacheService::CreateSession(const char *      clientID,
-                              PRInt32           storagePolicy, 
-                              PRBool            streamBased,
-                              nsICacheSession **result)
+nsCacheService::CreateSession(const char *          clientID,
+                              nsCacheStoragePolicy  storagePolicy, 
+                              PRBool                streamBased,
+                              nsICacheSession     **result)
 {
     *result = nsnull;
 

netwerk/cache/src/nsCacheService.h

@@ -32,8 +32,8 @@
 #include "nsCacheSession.h"
 #include "nsCacheDevice.h"
 #include "nsCacheEntry.h"
-#include "nsCacheRequest.h"
 
+class nsCacheRequest;
 
 class nsCacheDeviceElement {
 private:

netwerk/cache/src/nsCacheSession.cpp

@@ -30,9 +30,9 @@
 
 NS_IMPL_ISUPPORTS1(nsCacheSession, nsICacheSession)
 
-nsCacheSession::nsCacheSession(const char * clientID,
-                               PRInt32 storagePolicy,
-                               PRBool streamBased)
+nsCacheSession::nsCacheSession(const char *         clientID,
+                               nsCacheStoragePolicy storagePolicy,
+                               PRBool               streamBased)
     : mClientID(clientID),
       mStoragePolicy(storagePolicy),
       mStreamBased(streamBased)

netwerk/cache/src/nsCacheSession.h

@@ -37,7 +37,7 @@ public:
     NS_DECL_ISUPPORTS
     NS_DECL_NSICACHESESSION
     
-    nsCacheSession(const char * clientID, PRInt32 storagePolicy, PRBool streamBased);
+    nsCacheSession(const char * clientID, nsCacheStoragePolicy storagePolicy, PRBool streamBased);
     virtual ~nsCacheSession();
     
     nsCString *           ClientID()      { return &mClientID; }
@@ -45,9 +45,9 @@ public:
     PRBool                StreamBased()   { return mStreamBased; }
 
 private:
-    nsCString     mClientID;
-    PRInt32       mStoragePolicy;
-    PRBool        mStreamBased;
+    nsCString               mClientID;
+    nsCacheStoragePolicy    mStoragePolicy;
+    PRBool                  mStreamBased;
 };
 
 #endif // _nsCacheSession_h_