Bug 1688292 - Fix non-unified build errors in netwerk/cache2/ r=necko-reviewers,valentin

This is a drive-by fix while I was looking into something else.

Differential Revision: https://phabricator.services.mozilla.com/D102795

build/non-unified-compat

@@ -121,3 +121,4 @@ gfx/wr/
 gfx/ycbcr/
 hal/
 image/
+netwerk/cache2/

netwerk/cache2/CacheEntry.cpp

@@ -9,6 +9,7 @@
 #include "CacheFileUtils.h"
 #include "CacheIndex.h"
 
+#include "nsIAsyncOutputStream.h"
 #include "nsIInputStream.h"
 #include "nsIOutputStream.h"
 #include "nsISeekableStream.h"

netwerk/cache2/CacheFile.cpp

@@ -10,10 +10,14 @@
 #include "CacheFileChunk.h"
 #include "CacheFileInputStream.h"
 #include "CacheFileOutputStream.h"
+#include "CacheFileUtils.h"
+#include "CacheIndex.h"
 #include "CacheLog.h"
 #include "mozilla/DebugOnly.h"
 #include "mozilla/Telemetry.h"
+#include "mozilla/TelemetryHistogramEnums.h"
 #include "nsComponentManagerUtils.h"
+#include "nsICacheEntry.h"
 #include "nsProxyRelease.h"
 #include "nsThreadUtils.h"
 

netwerk/cache2/CacheFile.h

@@ -12,9 +12,11 @@
 #include "nsClassHashtable.h"
 #include "mozilla/Mutex.h"
 
+class nsIAsyncOutputStream;
+class nsICacheEntry;
+class nsICacheEntryMetaDataVisitor;
 class nsIInputStream;
 class nsIOutputStream;
-class nsICacheEntryMetaDataVisitor;
 
 namespace mozilla {
 namespace net {

netwerk/cache2/CacheFileContextEvictor.cpp

@@ -5,9 +5,11 @@
 #include "CacheLog.h"
 #include "CacheFileContextEvictor.h"
 #include "CacheFileIOManager.h"
+#include "CacheFileMetadata.h"
 #include "CacheIndex.h"
 #include "CacheIndexIterator.h"
 #include "CacheFileUtils.h"
+#include "CacheObserver.h"
 #include "nsIFile.h"
 #include "LoadContextInfo.h"
 #include "nsThreadUtils.h"

netwerk/cache2/CacheFileContextEvictor.h

@@ -6,8 +6,9 @@
 #define CacheFileContextEvictor__h__
 
 #include "mozilla/UniquePtr.h"
-#include "nsTArray.h"
 #include "nsCOMPtr.h"
+#include "nsString.h"
+#include "nsTArray.h"
 
 class nsIFile;
 class nsILoadContextInfo;

netwerk/cache2/CacheFileUtils.cpp

@@ -5,6 +5,7 @@
 #include "CacheIndex.h"
 #include "CacheLog.h"
 #include "CacheFileUtils.h"
+#include "CacheObserver.h"
 #include "LoadContextInfo.h"
 #include "mozilla/Tokenizer.h"
 #include "mozilla/Telemetry.h"

netwerk/cache2/CacheHashUtils.cpp

@@ -5,6 +5,8 @@
 #include "CacheHashUtils.h"
 
 #include "mozilla/BasePrincipal.h"
+#include "mozilla/EndianUtils.h"
+#include "mozilla/SHA1.h"
 #include "plstr.h"
 
 namespace mozilla {

netwerk/cache2/CacheIOThread.cpp

@@ -4,6 +4,8 @@
 
 #include "CacheIOThread.h"
 #include "CacheFileIOManager.h"
+#include "CacheLog.h"
+#include "CacheObserver.h"
 
 #include "nsIRunnable.h"
 #include "nsISupportsImpl.h"
@@ -14,6 +16,8 @@
 #include "mozilla/EventQueue.h"
 #include "mozilla/IOInterposer.h"
 #include "mozilla/ThreadEventQueue.h"
+#include "mozilla/Telemetry.h"
+#include "mozilla/TelemetryHistogramEnums.h"
 #include "GeckoProfiler.h"
 
 #ifdef XP_WIN

netwerk/cache2/CacheIndex.cpp

@@ -7,6 +7,7 @@
 #include "CacheLog.h"
 #include "CacheFileIOManager.h"
 #include "CacheFileMetadata.h"
+#include "CacheFileUtils.h"
 #include "CacheIndexIterator.h"
 #include "CacheIndexContextIterator.h"
 #include "nsThreadUtils.h"

netwerk/cache2/CacheObserver.cpp

@@ -179,8 +179,7 @@ bool CacheObserver::EntryIsTooBig(int64_t aSize, bool aUsingDisk) {
 bool CacheObserver::IsPastShutdownIOLag() {
 #ifdef DEBUG
   return false;
-#endif
-
+#else
   if (sShutdownDemandedTime == PR_INTERVAL_NO_TIMEOUT ||
       MaxShutdownIOLag() == UINT32_MAX) {
     return false;
@@ -194,6 +193,7 @@ bool CacheObserver::IsPastShutdownIOLag() {
   }
 
   return false;
+#endif
 }
 
 NS_IMETHODIMP

netwerk/cache2/CacheStorageService.cpp

@@ -1019,8 +1019,6 @@ NS_IMETHODIMP CacheStorageService::AsyncVisitAllStorages(
   RefPtr<WalkDiskCacheRunnable> event =
       new WalkDiskCacheRunnable(nullptr, aVisitEntries, aVisitor);
   return event->Walk();
-
-  return NS_OK;
 }
 
 // Methods used by CacheEntry for management of in-memory structures.