Bug 1765313, part 2 - Move the ShouldAllowAccessFor functions to Stor…

…ageAccess.h, r=anti-tracking-reviewers,timhuang

These functions are used to check if an object or context should have storage access.
Therefore they belong in StorageAccess.h with other functions that serve this purpose.

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

caps/BasePrincipal.cpp

@@ -36,7 +36,7 @@
 #include "prnetdb.h"
 #include "nsIURIFixup.h"
 #include "mozilla/dom/StorageUtils.h"
-#include "mozilla/ContentBlocking.h"
+#include "mozilla/StorageAccess.h"
 #include "nsPIDOMWindow.h"
 #include "nsIURIMutator.h"
 #include "mozilla/PermissionManager.h"
@@ -785,8 +785,7 @@ BasePrincipal::HasFirstpartyStorageAccess(mozIDOMWindow* aCheckWindow,
   if (NS_FAILED(rv)) {
     return rv;
   }
-  *aOutAllowed =
-      ContentBlocking::ShouldAllowAccessFor(win, uri, aRejectedReason);
+  *aOutAllowed = ShouldAllowAccessFor(win, uri, aRejectedReason);
   return NS_OK;
 }
 

dom/base/Document.cpp

@@ -49,7 +49,6 @@
 #include "mozilla/Base64.h"
 #include "mozilla/BasePrincipal.h"
 #include "mozilla/CSSEnabledState.h"
-#include "mozilla/ContentBlocking.h"
 #include "mozilla/ContentBlockingAllowList.h"
 #include "mozilla/ContentBlockingNotifier.h"
 #include "mozilla/ContentBlockingUserInteraction.h"
@@ -17701,8 +17700,7 @@ nsIPrincipal* Document::EffectiveStoragePrincipal() const {
   // We use the lower-level ContentBlocking API here to ensure this
   // check doesn't send notifications.
   uint32_t rejectedReason = 0;
-  if (ContentBlocking::ShouldAllowAccessFor(inner, GetDocumentURI(),
-                                            &rejectedReason)) {
+  if (ShouldAllowAccessFor(inner, GetDocumentURI(), &rejectedReason)) {
     return mActiveStoragePrincipal = NodePrincipal();
   }
 

dom/base/ThirdPartyUtil.cpp

@@ -13,12 +13,12 @@
 #include "mozilla/Assertions.h"
 #include "mozilla/BasePrincipal.h"
 #include "mozilla/ClearOnShutdown.h"
-#include "mozilla/ContentBlocking.h"
 #include "mozilla/ContentBlockingNotifier.h"
 #include "mozilla/Logging.h"
 #include "mozilla/MacroForEach.h"
 #include "mozilla/Components.h"
 #include "mozilla/StaticPtr.h"
+#include "mozilla/StorageAccess.h"
 #include "mozilla/TextUtils.h"
 #include "mozilla/Unused.h"
 #include "mozilla/dom/BrowsingContext.h"
@@ -512,8 +512,8 @@ ThirdPartyUtil::AnalyzeChannel(nsIChannel* aChannel, bool aNotify, nsIURI* aURI,
         aRequireThirdPartyCheck ? result.contains(ThirdPartyAnalysis::IsForeign)
                                 : true;
     if (performStorageChecks &&
-        ContentBlocking::ShouldAllowAccessFor(aChannel, aURI ? aURI : uri.get(),
-                                              aRejectedReason)) {
+        ShouldAllowAccessFor(aChannel, aURI ? aURI : uri.get(),
+                             aRejectedReason)) {
       result += ThirdPartyAnalysis::IsStorageAccessPermissionGranted;
     }
 

dom/security/ReferrerInfo.cpp

@@ -20,13 +20,13 @@
 #include "ReferrerInfo.h"
 
 #include "mozilla/BasePrincipal.h"
-#include "mozilla/ContentBlocking.h"
 #include "mozilla/ContentBlockingAllowList.h"
 #include "mozilla/net/CookieJarSettings.h"
 #include "mozilla/net/HttpBaseChannel.h"
 #include "mozilla/dom/Document.h"
 #include "mozilla/dom/Element.h"
 #include "mozilla/StaticPrefs_network.h"
+#include "mozilla/StorageAccess.h"
 #include "mozilla/StyleSheet.h"
 #include "mozilla/Telemetry.h"
 #include "nsIWebProgressListener.h"
@@ -210,8 +210,7 @@ ReferrerPolicy ReferrerInfo::GetDefaultReferrerPolicy(nsIHttpChannel* aChannel,
     if (XRE_IsParentProcess() && cjs->GetRejectThirdPartyContexts()) {
       uint32_t rejectedReason = 0;
       thirdPartyTrackerIsolated =
-          !ContentBlocking::ShouldAllowAccessFor(aChannel, aURI,
-                                                 &rejectedReason) &&
+          !ShouldAllowAccessFor(aChannel, aURI, &rejectedReason) &&
           rejectedReason !=
               static_cast<uint32_t>(
                   nsIWebProgressListener::STATE_COOKIES_PARTITIONED_FOREIGN);

image/ImageCacheKey.cpp

@@ -8,7 +8,6 @@
 #include <utility>
 
 #include "mozilla/AntiTrackingUtils.h"
-#include "mozilla/ContentBlocking.h"
 #include "mozilla/HashFunctions.h"
 #include "mozilla/StorageAccess.h"
 #include "mozilla/StoragePrincipalHelper.h"
@@ -17,6 +16,7 @@
 #include "mozilla/dom/File.h"
 #include "mozilla/dom/ServiceWorkerManager.h"
 #include "mozilla/StaticPrefs_privacy.h"
+#include "mozilla/StorageAccess.h"
 #include "nsContentUtils.h"
 #include "nsHashKeys.h"
 #include "nsLayoutUtils.h"
@@ -153,8 +153,8 @@ nsCString ImageCacheKey::GetIsolationKey(Document* aDocument, nsIURI* aURI) {
   // this point.  The best approach here is to be conservative: if we are sure
   // that the permission is granted, let's return 0. Otherwise, let's make a
   // unique image cache per the top-level document eTLD+1.
-  if (!ContentBlocking::ApproximateAllowAccessForWithoutChannel(
-          aDocument->GetInnerWindow(), aURI)) {
+  if (!ApproximateAllowAccessForWithoutChannel(aDocument->GetInnerWindow(),
+                                               aURI)) {
     // If we are here, the image is a 3rd-party resource loaded by a first-party
     // context. We can just use the document's base domain as the key because it
     // should be the same as the top-level document's base domain.

netwerk/cookie/CookieCommons.cpp

@@ -7,11 +7,11 @@
 #include "CookieCommons.h"
 #include "CookieLogging.h"
 #include "CookieService.h"
-#include "mozilla/ContentBlocking.h"
 #include "mozilla/ConsoleReportCollector.h"
 #include "mozilla/ContentBlockingNotifier.h"
 #include "mozilla/ScopeExit.h"
 #include "mozilla/StaticPrefs_network.h"
+#include "mozilla/StorageAccess.h"
 #include "mozilla/dom/Document.h"
 #include "mozilla/dom/nsMixedContentBlocker.h"
 #include "mozilla/net/CookieJarSettings.h"
@@ -386,8 +386,7 @@ already_AddRefed<Cookie> CookieCommons::CreateCookieFromDocument(
   if (aDocument->CookieJarSettings()->GetLimitForeignContexts() &&
       !aHasExistingCookiesLambda(baseDomain,
                                  storagePrincipal->OriginAttributesRef()) &&
-      !ContentBlocking::ShouldAllowAccessFor(innerWindow, principalURI,
-                                             &dummyRejectedReason)) {
+      !ShouldAllowAccessFor(innerWindow, principalURI, &dummyRejectedReason)) {
     return nullptr;
   }
 

netwerk/protocol/http/ClassifierDummyChannel.cpp

@@ -7,12 +7,12 @@
 
 #include "ClassifierDummyChannel.h"
 
-#include "mozilla/ContentBlocking.h"
 #include "mozilla/net/ClassifierDummyChannelChild.h"
 #include "mozilla/net/UrlClassifierCommon.h"
 #include "mozilla/dom/ContentChild.h"
 #include "mozilla/Preferences.h"
 #include "mozilla/StaticPrefs_privacy.h"
+#include "mozilla/StorageAccess.h"
 #include "nsContentSecurityManager.h"
 #include "nsIChannel.h"
 #include "nsIURI.h"
@@ -64,7 +64,7 @@ ClassifierDummyChannel::StorageAllowed(
     return eAsyncNeeded;
   }
 
-  if (ContentBlocking::ShouldAllowAccessFor(httpChannel, uri, nullptr)) {
+  if (ShouldAllowAccessFor(httpChannel, uri, nullptr)) {
     return eStorageGranted;
   }
 

netwerk/protocol/http/ClassifierDummyChannelChild.cpp

@@ -5,11 +5,11 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "ClassifierDummyChannelChild.h"
-#include "mozilla/ContentBlocking.h"
 #include "mozilla/ipc/BackgroundUtils.h"
 #include "mozilla/ipc/URIUtils.h"
 #include "nsIURI.h"
 #include "mozilla/AntiTrackingUtils.h"
+#include "mozilla/StorageAccess.h"
 #include "nsIHttpChannelInternal.h"
 #include "nsIHttpChannel.h"
 #include "mozilla/net/NeckoChannelParams.h"
@@ -82,8 +82,7 @@ mozilla::ipc::IPCResult ClassifierDummyChannelChild::Recv__delete__(
   RefPtr<HttpBaseChannel> httpChannel = do_QueryObject(channel);
   httpChannel->AddClassificationFlags(aClassificationFlags, mIsThirdParty);
 
-  bool storageGranted =
-      ContentBlocking::ShouldAllowAccessFor(httpChannel, mURI, nullptr);
+  bool storageGranted = ShouldAllowAccessFor(httpChannel, mURI, nullptr);
   mCallback(storageGranted);
   return IPC_OK();
 }