Revert "Bug 1781277: Implement DiskStorageLimit RFP target. r=tjr,dom-storage-reviewers,asuth" for causing xpcshell failures in test_temporaryStorageRFP.js

This reverts commit 7a92b22.

Author: Cristian Tuns

dom/quota/ActorsParent.cpp

@@ -1332,12 +1332,6 @@ void GetJarPrefix(bool aInIsolatedMozBrowser, nsACString& aJarPrefix) {
 // This method computes and returns our best guess for the temporary storage
 // limit (in bytes), based on disk capacity.
 Result<uint64_t, nsresult> GetTemporaryStorageLimit(nsIFile& aStorageDir) {
-  if (nsContentUtils::ShouldResistFingerprinting(
-          "The storage limit is set only once and not webpage specific.",
-          RFPTarget::DiskStorageLimit)) {
-    return nsRFPService::GetSpoofedStorageLimit();
-  }
-
   // The fixed limit pref can be used to override temporary storage limit
   // calculation.
   if (StaticPrefs::dom_quotaManager_temporaryStorage_fixedLimit() >= 0) {
@@ -7513,21 +7507,17 @@ void QuotaManager::SetThumbnailPrivateIdentityId(
   }
 }
 
-/* static */
-uint64_t QuotaManager::GetGroupLimitForLimit(uint64_t aLimit) {
+uint64_t QuotaManager::GetGroupLimit() const {
   // To avoid one group evicting all the rest, limit the amount any one group
   // can use to 20% resp. a fifth. To prevent individual sites from using
   // exorbitant amounts of storage where there is a lot of free space, cap the
   // group limit to 10GB.
-  const auto x = std::min<uint64_t>(aLimit / 5, 10 GB);
+  const auto x = std::min<uint64_t>(mTemporaryStorageLimit / 5, 10 GB);
 
   // In low-storage situations, make an exception (while not exceeding the total
   // storage limit).
-  return std::min<uint64_t>(aLimit, std::max<uint64_t>(x, 10 MB));
-}
-
-uint64_t QuotaManager::GetGroupLimit() const {
-  return GetGroupLimitForLimit(mTemporaryStorageLimit);
+  return std::min<uint64_t>(mTemporaryStorageLimit,
+                            std::max<uint64_t>(x, 10 MB));
 }
 
 Maybe<OriginStateMetadata> QuotaManager::GetOriginStateMetadata(

dom/quota/QuotaManager.h

@@ -681,7 +681,6 @@ class QuotaManager final : public BackgroundThreadObject {
   void SetThumbnailPrivateIdentityId(uint32_t aThumbnailPrivateIdentityId);
 
   uint64_t GetGroupLimit() const;
-  static uint64_t GetGroupLimitForLimit(uint64_t aLimit);
 
   Maybe<OriginStateMetadata> GetOriginStateMetadata(
       const OriginMetadata& aOriginMetadata);

dom/quota/test/xpcshell/test_temporaryStorageRFP.js

@@ -170,5 +170,3 @@ run-if = ["!condprof"]
 support-files = ["unsetLastAccessTime_profile.zip"]
 
 ["test_validOrigins.js"]
-
-["test_temporaryStorageRFP.js"]

dom/quota/test/xpcshell/xpcshell.toml

@@ -100,7 +100,6 @@ ITEM_VALUE(WebGPUSubgroupSizes,         66)
 ITEM_VALUE(JSLocalePrompt,              67)
 ITEM_VALUE(ScreenAvailToResolution,     68)
 ITEM_VALUE(UseHardcodedFontSubstitutes, 69)
-ITEM_VALUE(DiskStorageLimit,            70)
 
 
 // !!! Don't forget to update kDefaultFingerprintingProtections in nsRFPService.cpp

toolkit/components/resistfingerprinting/RFPTargets.inc

@@ -53,7 +53,6 @@
 #include "mozilla/dom/KeyboardEventBinding.h"
 #include "mozilla/dom/WindowGlobalParent.h"
 #include "mozilla/dom/MediaDeviceInfoBinding.h"
-#include "mozilla/dom/quota/QuotaManager.h"
 #include "mozilla/fallible.h"
 #include "mozilla/XorShift128PlusRNG.h"
 #include "mozilla/dom/CanvasUtils.h"
@@ -2688,17 +2687,3 @@ CSSIntRect nsRFPService::GetSpoofedScreenAvailSize(const nsRect& aRect,
   return CSSIntRect::FromAppUnitsRounded(
       nsRect{0, 0, aRect.width, aRect.height - spoofedHeightOffset});
 }
-
-/* static */
-uint64_t nsRFPService::GetSpoofedStorageLimit() {
-  uint64_t gib = 1024ULL * 1024ULL * 1024ULL;  // 1 GiB
-#ifdef ANDROID
-  uint64_t limit = 32ULL * gib;  // 32 GiB
-#else
-  uint64_t limit = 50ULL * gib;  // 50 GiB
-#endif
-  MOZ_ASSERT(limit / 5 ==
-             dom::quota::QuotaManager::GetGroupLimitForLimit(limit));
-
-  return limit;
-}

toolkit/components/resistfingerprinting/nsRFPService.cpp

@@ -414,8 +414,6 @@ class nsRFPService final : public nsIObserver, public nsIRFPService {
   static CSSIntRect GetSpoofedScreenAvailSize(const nsRect& aRect, float aScale,
                                               bool aIsFullscreen);
 
-  static uint64_t GetSpoofedStorageLimit();
-
  private:
   nsresult Init();