Bug 1827504 - Remove last files of netwerk/cache/ r=sunil,geckoview-r…

…eviewers,zeid,m_kato Differential Revision: https://phabricator.services.mozilla.com/D175177
dothq · Apr 13, 2023 · 401d933 · 401d933
1 parent 4d4ecbb
commit 401d933
Show file tree

Hide file tree

Showing 14 changed files with 6 additions and 154 deletions.
diff --git a/build/sanitizers/ubsan_signed_overflow_blacklist.txt b/build/sanitizers/ubsan_signed_overflow_blacklist.txt
@@ -221,7 +221,6 @@ src:*/gfx/skia/skia/include/private/SkChecksum.h
 src:*/intl/icu/source/common/unifiedcache.h
 src:*/mfbt/SHA1.cpp
 src:*/modules/zlib/src/adler32.c
-src:*/netwerk/cache/nsDiskCacheDevice.cpp
 src:*/netwerk/cache2/CacheHashUtils.cpp
 src:*/netwerk/sctp/src/netinet/sctp_sha1.c
 src:*/netwerk/srtp/src/crypto/hash/sha1.c

diff --git a/build/sanitizers/ubsan_unsigned_overflow_blacklist.txt b/build/sanitizers/ubsan_unsigned_overflow_blacklist.txt
@@ -228,7 +228,6 @@ src:*/gfx/skia/skia/include/private/SkChecksum.h
 src:*/intl/icu/source/common/unifiedcache.h
 src:*/mfbt/SHA1.cpp
 src:*/modules/zlib/src/adler32.c
-src:*/netwerk/cache/nsDiskCacheDevice.cpp
 src:*/netwerk/cache2/CacheHashUtils.cpp
 src:*/netwerk/sctp/src/netinet/sctp_sha1.c
 src:*/netwerk/srtp/src/crypto/hash/sha1.c

diff --git a/docs/mots/index.rst b/docs/mots/index.rst
@@ -1500,7 +1500,7 @@ The Mozilla Networking Library
         | `netwerk/\*\*/\* <https://searchfox.org/mozilla-central/search?q=&path=netwerk/\*\*/\*>`__
         | `netwerk/base/\*\*/\* <https://searchfox.org/mozilla-central/search?q=&path=netwerk/base/\*\*/\*>`__
         | `netwerk/build/\*\*/\* <https://searchfox.org/mozilla-central/search?q=&path=netwerk/build/\*\*/\*>`__
-        | `netwerk/cache/\*\*/\* <https://searchfox.org/mozilla-central/search?q=&path=netwerk/cache/\*\*/\*>`__
+        | `netwerk/cache2/\*\*/\* <https://searchfox.org/mozilla-central/search?q=&path=netwerk/cache2/\*\*/\*>`__
         | `netwerk/dns/\*\*/\* <https://searchfox.org/mozilla-central/search?q=&path=netwerk/dns/\*\*/\*>`__
         | `netwerk/locales/\*\*/\* <https://searchfox.org/mozilla-central/search?q=&path=netwerk/locales/\*\*/\*>`__
         | `netwerk/mime/\*\*/\* <https://searchfox.org/mozilla-central/search?q=&path=netwerk/mime/\*\*/\*>`__

diff --git a/mots.yaml b/mots.yaml
@@ -8,7 +8,7 @@
 # documentation and how to modify this file.
 repo: mozilla-central
 created_at: '2021-10-14T12:50:40.073465'
-updated_at: '2023-04-04T10:50:59.346928'
+updated_at: '2023-04-12T14:39:57.947364'
 export:
   path: ./docs/mots/index.rst
   format: rst
@@ -2152,7 +2152,7 @@ modules:
       - netwerk/**/*
       - netwerk/base/**/*
       - netwerk/build/**/*
-      - netwerk/cache/**/*
+      - netwerk/cache2/**/*
       - netwerk/dns/**/*
       - netwerk/locales/**/*
       - netwerk/mime/**/*
@@ -4083,5 +4083,5 @@ modules:
         - Ryan Tilder
       group: dev-platform
 hashes:
-  config: 6dcd6203d12824b5ee47fcb31ea5bbdca588d06e
-  export: 4e8ece19caf52a866630717755b1006885b07f63
+  config: ae2d574be8b71032afd58d06fdada016eff41c68
+  export: fbbc9a293c177a87694878b68cfedbf12670e835
diff --git a/netwerk/build/moz.build b/netwerk/build/moz.build
@@ -22,7 +22,6 @@ FINAL_LIBRARY = "xul"
 
 LOCAL_INCLUDES += [
     "/netwerk/base",
-    "/netwerk/cache",
     "/netwerk/dns",
     "/netwerk/mime",
     "/netwerk/protocol/about",

diff --git a/netwerk/build/nsNetCID.h b/netwerk/build/nsNetCID.h
@@ -423,7 +423,7 @@
   }
 
 /******************************************************************************
- * netwerk/cache/ classes
+ * netwerk/cache2/ classes
  */
 
 // service implementing nsICacheService.

diff --git a/netwerk/cache/moz.build b/netwerk/cache/moz.build
diff --git a/netwerk/cache/nsCacheUtils.cpp b/netwerk/cache/nsCacheUtils.cpp
diff --git a/netwerk/cache/nsCacheUtils.h b/netwerk/cache/nsCacheUtils.h
diff --git a/netwerk/cache2/CacheFileIOManager.cpp b/netwerk/cache2/CacheFileIOManager.cpp
@@ -6,7 +6,6 @@
 #include "CacheLog.h"
 #include "CacheFileIOManager.h"
 
-#include "../cache/nsCacheUtils.h"
 #include "CacheHashUtils.h"
 #include "CacheStorageService.h"
 #include "CacheIndex.h"

diff --git a/netwerk/cache2/CacheFileMetadata.cpp b/netwerk/cache2/CacheFileMetadata.cpp
@@ -12,7 +12,6 @@
 #include "CacheFileUtils.h"
 #include "nsILoadContextInfo.h"
 #include "nsICacheEntry.h"  // for nsICacheEntryMetaDataVisitor
-#include "../cache/nsCacheUtils.h"
 #include "nsIFile.h"
 #include "mozilla/ScopeExit.h"
 #include "mozilla/Telemetry.h"

diff --git a/netwerk/cache2/moz.build b/netwerk/cache2/moz.build
@@ -59,7 +59,6 @@ if CONFIG["MOZ_WIDGET_TOOLKIT"] != "android":
 
 LOCAL_INCLUDES += [
     "/netwerk/base",
-    "/netwerk/cache",
 ]
 
 include("/ipc/chromium/chromium-config.mozbuild")

diff --git a/netwerk/moz.build b/netwerk/moz.build
@@ -14,7 +14,6 @@ DIRS += [
     "socket",
     "mime",
     "streamconv",
-    "cache",
     "cache2",
     "protocol",
     "system",

diff --git a/widget/android/moz.build b/widget/android/moz.build
@@ -188,7 +188,6 @@ LOCAL_INCLUDES += [
     "/layout/forms",
     "/layout/painting",
     "/netwerk/base",
-    "/netwerk/cache",
     "/toolkit/components/telemetry",
     "/widget",
     "/widget/headless",