Bug 1620322 - Part 8: Rename AntiTrackingCommon to ContentBlocking; r=baku
☠☠ backed out by 5b47cfcab155 ☠ ☠
authorEhsan Akhgari <ehsan@mozilla.com>
Mon, 09 Mar 2020 18:12:40 +0000
changeset 517656 be942a7f329e12b591f318c11f9d09caab59fc6f
parent 517655 a916987c7c71e2bc483a619f06859237225d6d4e
child 517657 f41739c64dff7f559754d90f993b5abe60f5f8a1
push id37199
push useropoprus@mozilla.com
push dateTue, 10 Mar 2020 03:43:44 +0000
treeherdermozilla-central@6f21f98dcfcd [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbaku
bugs1620322
milestone75.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1620322 - Part 8: Rename AntiTrackingCommon to ContentBlocking; r=baku Differential Revision: https://phabricator.services.mozilla.com/D65821
build/win32/orderfile.txt
build/win64/orderfile.txt
dom/base/Document.cpp
dom/base/Navigator.cpp
dom/base/ThirdPartyUtil.cpp
dom/base/nsContentUtils.cpp
dom/base/nsGlobalWindowInner.cpp
dom/base/nsGlobalWindowOuter.cpp
dom/base/nsPIDOMWindow.h
dom/ipc/ContentParent.cpp
dom/security/ReferrerInfo.cpp
dom/workers/RuntimeService.cpp
image/ImageCacheKey.cpp
media/webrtc/signaling/src/peerconnection/RTCStatsReport.h
netwerk/base/nsNetUtil.cpp
netwerk/cookie/CookieServiceChild.cpp
netwerk/protocol/http/ClassifierDummyChannel.cpp
netwerk/protocol/http/ClassifierDummyChannelChild.cpp
netwerk/protocol/http/HttpChannelChild.cpp
netwerk/protocol/http/nsHttpChannel.cpp
netwerk/url-classifier/UrlClassifierCommon.h
netwerk/url-classifier/UrlClassifierFeatureBase.h
netwerk/url-classifier/UrlClassifierFeatureCryptominingAnnotation.cpp
netwerk/url-classifier/UrlClassifierFeatureCryptominingProtection.cpp
netwerk/url-classifier/UrlClassifierFeatureFingerprintingAnnotation.cpp
netwerk/url-classifier/UrlClassifierFeatureFingerprintingProtection.cpp
netwerk/url-classifier/UrlClassifierFeatureSocialTrackingAnnotation.cpp
netwerk/url-classifier/UrlClassifierFeatureSocialTrackingProtection.cpp
netwerk/url-classifier/UrlClassifierFeatureTrackingAnnotation.cpp
netwerk/url-classifier/UrlClassifierFeatureTrackingProtection.cpp
toolkit/components/antitracking/AntiTrackingCommon.cpp
toolkit/components/antitracking/AntiTrackingCommon.h
toolkit/components/antitracking/AntiTrackingRedirectHeuristic.cpp
toolkit/components/antitracking/ContentBlocking.cpp
toolkit/components/antitracking/ContentBlocking.h
toolkit/components/antitracking/ContentBlockingAllowList.h
toolkit/components/antitracking/ContentBlockingNotifier.cpp
toolkit/components/antitracking/ContentBlockingUserInteraction.cpp
toolkit/components/antitracking/StorageAccess.cpp
toolkit/components/antitracking/StoragePrincipalHelper.cpp
toolkit/components/antitracking/TemporaryAccessGrantObserver.cpp
toolkit/components/antitracking/moz.build
--- a/build/win32/orderfile.txt
+++ b/build/win32/orderfile.txt
@@ -19399,17 +19399,16 @@ Gecko_BeginWritingCString
 ?MaybeCreate@UrlClassifierFeatureFingerprintingProtection@net@mozilla@@SA?AU?$already_AddRefed@VUrlClassifierFeatureFingerprintingProtection@net@mozilla@@@@PAVnsIChannel@@@Z
 ?MaybeCreate@UrlClassifierFeatureTrackingProtection@net@mozilla@@SA?AU?$already_AddRefed@VUrlClassifierFeatureTrackingProtection@net@mozilla@@@@PAVnsIChannel@@@Z
 ?MaybeCreate@UrlClassifierFeatureCryptominingAnnotation@net@mozilla@@SA?AU?$already_AddRefed@VUrlClassifierFeatureCryptominingAnnotation@net@mozilla@@@@PAVnsIChannel@@@Z
 ?MaybeCreate@UrlClassifierFeatureFingerprintingAnnotation@net@mozilla@@SA?AU?$already_AddRefed@VUrlClassifierFeatureFingerprintingAnnotation@net@mozilla@@@@PAVnsIChannel@@@Z
 ?MaybeCreate@UrlClassifierFeatureTrackingAnnotation@net@mozilla@@SA?AU?$already_AddRefed@VUrlClassifierFeatureTrackingAnnotation@net@mozilla@@@@PAVnsIChannel@@@Z
 ?ShouldEnableClassifier@UrlClassifierCommon@net@mozilla@@SA_NPAVnsIChannel@@@Z
 ?AddonMayLoad@UrlClassifierCommon@net@mozilla@@SA_NPAVnsIChannel@@PAVnsIURI@@@Z
 ?GetTopWindowURI@HttpBaseChannel@net@mozilla@@UAG?AW4nsresult@@PAPAVnsIURI@@@Z
-?MaybeGetDocumentURIBeingLoaded@AntiTrackingCommon@mozilla@@SA?AU?$already_AddRefed@VnsIURI@@@@PAVnsIChannel@@@Z
 ?GetTopWindowURI@HttpBaseChannel@net@mozilla@@IAE?AW4nsresult@@PAVnsIURI@@PAPAV5@@Z
 XPCOMService_GetThirdPartyUtil
 ?GetTopWindowForChannel@ThirdPartyUtil@@UAG?AW4nsresult@@PAVnsIChannel@@PAVnsIURI@@PAPAVmozIDOMWindowProxy@@@Z
 ?GetTopExcludingExtensionAccessibleContentFrames@nsGlobalWindowOuter@@QAE?AU?$already_AddRefed@VnsPIDOMWindowOuter@@@@PAVnsIURI@@@Z
 ?AddonAllowsLoad@BasePrincipal@mozilla@@QAE_NPAVnsIURI@@_N@Z
 ?GetURIFromWindow@ThirdPartyUtil@@UAG?AW4nsresult@@PAVmozIDOMWindowProxy@@PAPAVnsIURI@@@Z
 ?GetPrincipalFromWindow@ThirdPartyUtil@@UAG?AW4nsresult@@PAVmozIDOMWindowProxy@@PAPAVnsIPrincipal@@@Z
 ?MaybeCreate@UrlClassifierFeatureFlash@net@mozilla@@SAXPAVnsIChannel@@AAV?$nsTArray@V?$nsCOMPtr@VnsIUrlClassifierFeature@@@@@@@Z
@@ -19527,38 +19526,35 @@ XPCOMService_GetThirdPartyUtil
 ?IsThirdPartyChannel@ThirdPartyUtil@@UAG?AW4nsresult@@PAVnsIChannel@@PAVnsIURI@@PA_N@Z
 ?GetThirdPartyFlags@HttpBaseChannel@net@mozilla@@UAG?AW4nsresult@@PAI@Z
 ?GetIsInThirdPartyContext@LoadInfo@net@mozilla@@UAG?AW4nsresult@@PA_N@Z
 ?IsThirdPartyInternal@ThirdPartyUtil@@AAE?AW4nsresult@@ABV?$nsTString@D@@PAVnsIURI@@PA_N@Z
 ?IsTrackingResource@HttpBaseChannel@net@mozilla@@UAG?AW4nsresult@@PA_N@Z
 ?IsTrackingClassificationFlag@UrlClassifierCommon@net@mozilla@@SA_NI@Z
 ?DeQueue@nsHostResolver@@AAEXAAV?$LinkedList@V?$RefPtr@VnsHostRecord@@@@@mozilla@@PAPAVAddrHostRecord@@@Z
 ?popFirst@?$LinkedList@V?$RefPtr@VnsHostRecord@@@@@mozilla@@QAE?AV?$RefPtr@VnsHostRecord@@@@XZ
-?IsFirstPartyStorageAccessGrantedFor@AntiTrackingCommon@mozilla@@SA_NPAVnsIHttpChannel@@PAVnsIURI@@PAI@Z
 ?GetTopLevelPrincipal@LoadInfo@net@mozilla@@UAEPAVnsIPrincipal@@XZ
 ?GetIsMainDocumentChannel@HttpBaseChannel@net@mozilla@@UAG?AW4nsresult@@PA_N@Z
 ?GetAddrInfo@net@mozilla@@YA?AW4nsresult@@ABV?$nsTSubstring@D@@GGPAPAVAddrInfo@12@_N@Z
 ?GetIsContentPrincipal@BasePrincipal@mozilla@@UAG?AW4nsresult@@PA_N@Z
 ?CookiePermission@CookieSettings@net@mozilla@@UAG?AW4nsresult@@PAVnsIPrincipal@@PAI@Z
 ?GetInstance@nsPermissionManager@@SAPAV1@XZ
 ?Create@nsPermission@@SA?AU?$already_AddRefed@VnsPermission@@@@PAVnsIPrincipal@@ABV?$nsTSubstring@D@@II_J@Z
 ?CloneStrippingUserContextIdAndFirstPartyDomain@BasePrincipal@mozilla@@QAE?AU?$already_AddRefed@VBasePrincipal@mozilla@@@@XZ
 ??0nsPermission@@IAE@PAVnsIPrincipal@@ABV?$nsTSubstring@D@@II_J@Z
 ?AddRef@nsPermission@@UAGKXZ
 ??$AppendElement@AAV?$nsCOMPtr@VnsIPermission@@@@UnsTArrayInfallibleAllocator@@@?$nsTArray_Impl@V?$RefPtr@VnsIPermission@@@@UnsTArrayInfallibleAllocator@@@@IAEPAV?$RefPtr@VnsIPermission@@@@AAV?$nsCOMPtr@VnsIPermission@@@@@Z
 ?Release@nsPermission@@UAGKXZ
 ?extensions_cookiesBehavior_overrideOnTopLevel@StaticPrefs@mozilla@@SA_NXZ
 ?GetChannelId@HttpBaseChannel@net@mozilla@@UAG?AW4nsresult@@PA_K@Z
 ??$?0PAV?$nsTArray@V?$function@$$A6AXXZ@std@@@@V?$DefaultDelete@V?$nsTArray@V?$function@$$A6AXXZ@std@@@@@mozilla@@@?$PairHelper@PAV?$nsTArray@V?$function@$$A6AXXZ@std@@@@V?$DefaultDelete@V?$nsTArray@V?$function@$$A6AXXZ@std@@@@@mozilla@@$00$0A@@detail@mozilla@@IAE@$$QAPAV?$nsTArray@V?$function@$$A6AXXZ@std@@@@$$QAV?$DefaultDelete@V?$nsTArray@V?$function@$$A6AXXZ@std@@@@@2@@Z
-?OnAntiTrackingSettingsChanged@AntiTrackingCommon@mozilla@@SAXABV?$function@$$A6AXXZ@std@@@Z
 ?first@?$PairHelper@PAV?$nsTArray@V?$function@$$A6AXXZ@std@@@@V?$DefaultDelete@V?$nsTArray@V?$function@$$A6AXXZ@std@@@@@mozilla@@$00$0A@@detail@mozilla@@IBEABQAV?$nsTArray@V?$function@$$A6AXXZ@std@@@@XZ
 ??4?$UniquePtr@V?$nsTArray@V?$function@$$A6AXXZ@std@@@@V?$DefaultDelete@V?$nsTArray@V?$function@$$A6AXXZ@std@@@@@mozilla@@@mozilla@@QAEAAV01@$$QAV01@@Z
 ??$AppendElement@ABV?$function@$$A6AXXZ@std@@UnsTArrayInfallibleAllocator@@@?$nsTArray_Impl@V?$function@$$A6AXXZ@std@@UnsTArrayInfallibleAllocator@@@@IAEPAV?$function@$$A6AXXZ@std@@ABV12@@Z
 ??$EnsureCapacity@UnsTArrayInfallibleAllocator@@@?$nsTArray_base@UnsTArrayInfallibleAllocator@@U?$nsTArray_CopyWithConstructors@V?$function@$$A6AXXZ@std@@@@@@IAE?AUnsTArrayInfallibleResult@@II@Z
-?IsOnContentBlockingAllowList@AntiTrackingCommon@mozilla@@SA?AW4nsresult@@PAVnsIURI@@_NW4ContentBlockingAllowListPurpose@12@AA_N@Z
 ?TestPermissionOriginNoSuffix@nsPermissionManager@@UAG?AW4nsresult@@ABV?$nsTSubstring@D@@0PAI@Z
 ?NS_IsSafeTopLevelNav@@YA_NPAVnsIChannel@@@Z
 ?IsSafeMethod@nsHttpRequestHead@net@mozilla@@QAE_NXZ
 ?NS_IsSameSiteForeign@@YA_NPAVnsIChannel@@PAVnsIURI@@@Z
 ?GetCookieStringInternal@nsCookieService@@IAEXPAVnsIURI@@PAVnsIChannel@@_N22222ABVOriginAttributes@mozilla@@AAV?$nsTString@D@@@Z
 ?GetCookiesForURI@nsCookieService@@QAEXPAVnsIURI@@PAVnsIChannel@@_N22222ABVOriginAttributes@mozilla@@AAV?$nsTArray@PAVnsCookie@@@@@Z
 ?EnsureReadComplete@nsCookieService@@IAEX_N@Z
 ?GetBaseDomain@nsCookieService@@SA?AW4nsresult@@PAVnsIEffectiveTLDService@@PAVnsIURI@@AAV?$nsTString@D@@AA_N@Z
@@ -26363,17 +26359,16 @@ Gecko_AppendPropertyValuePair
 ?PreloadImage@nsHtml5TreeOpExecutor@@QAEXABV?$nsTSubstring@_S@@0000@Z
 ?ResolvePreloadImage@Document@dom@mozilla@@QAE?AU?$already_AddRefed@VnsIURI@@@@PAVnsIURI@@ABV?$nsTSubstring@_S@@11PA_N@Z
 ?SelectSourceForTagWithAttrs@HTMLImageElement@dom@mozilla@@SA_NPAVDocument@23@_NABV?$nsTSubstring@_S@@2222AAV5@@Z
 ?MaybePreLoadImage@Document@dom@mozilla@@QAEXPAVnsIURI@@ABV?$nsTSubstring@_S@@W4ReferrerPolicy@net@3@_N@Z
 ?IsImageInCache@nsContentUtils@@SA_NPAVnsIURI@@PAVDocument@dom@mozilla@@@Z
 ?QueryInterface@imgLoader@@UAG?AW4nsresult@@ABUnsID@@PAPAX@Z
 ?FindEntryProperties@imgLoader@@UAG?AW4nsresult@@PAVnsIURI@@PAVDocument@dom@mozilla@@PAPAVnsIProperties@@@Z
 ?IsThirdPartyTrackingResourceWindow@nsContentUtils@@SA_NPAVnsPIDOMWindowInner@@@Z
-?MaybeIsFirstPartyStorageAccessGrantedFor@AntiTrackingCommon@mozilla@@SA_NPAVnsPIDOMWindowInner@@PAVnsIURI@@@Z
 ??$CreateAndResolve@_N@?$MozPromise@H_N$00@mozilla@@SA?AV?$RefPtr@V?$MozPromise@H_N$00@mozilla@@@@$$QA_NPBD@Z
 ?AdjustPriority@HttpBaseChannel@net@mozilla@@UAG?AW4nsresult@@H@Z
 ?SetTimingEnabled@imgRequestProxy@@UAG?AW4nsresult@@_N@Z
 ?s_HashKey@?$nsTHashtable@V?$nsBaseHashtableET@VnsURIHashKey@@V?$RefPtr@VimgIRequest@@@@@@@@KAIPBX@Z
 ?s_InitEntry@?$nsTHashtable@V?$nsBaseHashtableET@VnsURIHashKey@@V?$RefPtr@VimgIRequest@@@@@@@@KAXPAUPLDHashEntryHdr@@PBX@Z
 ?UpdateEffectProperties@EffectCompositor@mozilla@@QAEXPBVComputedStyle@2@PAVElement@dom@2@W4PseudoStyleType@2@@Z
 ??$?8UnsTArrayInfallibleAllocator@@@?$nsTArray_Impl@UAnimationPropertySegment@mozilla@@UnsTArrayInfallibleAllocator@@@@QBE_NABV0@@Z
 ??8AnimationPropertySegment@mozilla@@QBE_NABU01@@Z
--- a/build/win64/orderfile.txt
+++ b/build/win64/orderfile.txt
@@ -19317,17 +19317,16 @@ Gecko_BeginWritingCString
 ?MaybeCreate@UrlClassifierFeatureFingerprintingProtection@net@mozilla@@SA?AU?$already_AddRefed@VUrlClassifierFeatureFingerprintingProtection@net@mozilla@@@@PEAVnsIChannel@@@Z
 ?MaybeCreate@UrlClassifierFeatureTrackingProtection@net@mozilla@@SA?AU?$already_AddRefed@VUrlClassifierFeatureTrackingProtection@net@mozilla@@@@PEAVnsIChannel@@@Z
 ?MaybeCreate@UrlClassifierFeatureCryptominingAnnotation@net@mozilla@@SA?AU?$already_AddRefed@VUrlClassifierFeatureCryptominingAnnotation@net@mozilla@@@@PEAVnsIChannel@@@Z
 ?MaybeCreate@UrlClassifierFeatureFingerprintingAnnotation@net@mozilla@@SA?AU?$already_AddRefed@VUrlClassifierFeatureFingerprintingAnnotation@net@mozilla@@@@PEAVnsIChannel@@@Z
 ?MaybeCreate@UrlClassifierFeatureTrackingAnnotation@net@mozilla@@SA?AU?$already_AddRefed@VUrlClassifierFeatureTrackingAnnotation@net@mozilla@@@@PEAVnsIChannel@@@Z
 ?ShouldEnableClassifier@UrlClassifierCommon@net@mozilla@@SA_NPEAVnsIChannel@@@Z
 ?AddonMayLoad@UrlClassifierCommon@net@mozilla@@SA_NPEAVnsIChannel@@PEAVnsIURI@@@Z
 ?GetTopWindowURI@HttpBaseChannel@net@mozilla@@UEAA?AW4nsresult@@PEAPEAVnsIURI@@@Z
-?MaybeGetDocumentURIBeingLoaded@AntiTrackingCommon@mozilla@@SA?AU?$already_AddRefed@VnsIURI@@@@PEAVnsIChannel@@@Z
 ?GetTopWindowURI@HttpBaseChannel@net@mozilla@@IEAA?AW4nsresult@@PEAVnsIURI@@PEAPEAV5@@Z
 XPCOMService_GetThirdPartyUtil
 ?GetTopWindowForChannel@ThirdPartyUtil@@UEAA?AW4nsresult@@PEAVnsIChannel@@PEAVnsIURI@@PEAPEAVmozIDOMWindowProxy@@@Z
 ?GetTopExcludingExtensionAccessibleContentFrames@nsGlobalWindowOuter@@QEAA?AU?$already_AddRefed@VnsPIDOMWindowOuter@@@@PEAVnsIURI@@@Z
 ?AddonAllowsLoad@BasePrincipal@mozilla@@QEAA_NPEAVnsIURI@@_N@Z
 ?GetURIFromWindow@ThirdPartyUtil@@UEAA?AW4nsresult@@PEAVmozIDOMWindowProxy@@PEAPEAVnsIURI@@@Z
 ?GetPrincipalFromWindow@ThirdPartyUtil@@UEAA?AW4nsresult@@PEAVmozIDOMWindowProxy@@PEAPEAVnsIPrincipal@@@Z
 ?MaybeCreate@UrlClassifierFeatureFlash@net@mozilla@@SAXPEAVnsIChannel@@AEAV?$nsTArray@V?$nsCOMPtr@VnsIUrlClassifierFeature@@@@@@@Z
@@ -19438,17 +19437,16 @@ XPCOMService_GetThirdPartyUtil
 ?GetCookieStringFromHttp@nsCookieService@@UEAA?AW4nsresult@@PEAVnsIURI@@0PEAVnsIChannel@@PEAPEAD@Z
 ?GetCookieStringCommon@nsCookieService@@IEAA?AW4nsresult@@PEAVnsIURI@@PEAVnsIChannel@@_NPEAPEAD@Z
 ?IsThirdPartyChannel@ThirdPartyUtil@@UEAA?AW4nsresult@@PEAVnsIChannel@@PEAVnsIURI@@PEA_N@Z
 ?GetThirdPartyFlags@HttpBaseChannel@net@mozilla@@UEAA?AW4nsresult@@PEAI@Z
 ?GetIsInThirdPartyContext@LoadInfo@net@mozilla@@UEAA?AW4nsresult@@PEA_N@Z
 ?IsThirdPartyInternal@ThirdPartyUtil@@AEAA?AW4nsresult@@AEBV?$nsTString@D@@PEAVnsIURI@@PEA_N@Z
 ?IsTrackingResource@HttpBaseChannel@net@mozilla@@UEAA?AW4nsresult@@PEA_N@Z
 ?IsTrackingClassificationFlag@UrlClassifierCommon@net@mozilla@@SA_NI@Z
-?IsFirstPartyStorageAccessGrantedFor@AntiTrackingCommon@mozilla@@SA_NPEAVnsIHttpChannel@@PEAVnsIURI@@PEAI@Z
 ?GetTopLevelPrincipal@LoadInfo@net@mozilla@@UEAAPEAVnsIPrincipal@@XZ
 ?GetIsMainDocumentChannel@HttpBaseChannel@net@mozilla@@UEAA?AW4nsresult@@PEA_N@Z
 ?GetIsContentPrincipal@BasePrincipal@mozilla@@UEAA?AW4nsresult@@PEA_N@Z
 ?CookiePermission@CookieSettings@net@mozilla@@UEAA?AW4nsresult@@PEAVnsIPrincipal@@PEAI@Z
 ?GetInstance@nsPermissionManager@@SAPEAV1@XZ
 ?Run@?$RunnableMethodImpl@PEAVnsHostResolver@@P81@EAAXXZ$00$0A@$$V@detail@mozilla@@UEAA?AW4nsresult@@XZ
 ?ThreadFunc@nsHostResolver@@AEAAXXZ
 ?GetHostToLookup@nsHostResolver@@AEAA_NPEAPEAVAddrHostRecord@@@Z
@@ -19459,22 +19457,20 @@ XPCOMService_GetThirdPartyUtil
 ?GetAddrInfo@net@mozilla@@YA?AW4nsresult@@AEBV?$nsTSubstring@D@@GGPEAPEAVAddrInfo@12@_N@Z
 ??0nsPermission@@IEAA@PEAVnsIPrincipal@@AEBV?$nsTSubstring@D@@II_J@Z
 ?AddRef@nsPermission@@UEAAKXZ
 ??$AppendElement@AEAV?$nsCOMPtr@VnsIPermission@@@@UnsTArrayInfallibleAllocator@@@?$nsTArray_Impl@V?$RefPtr@VnsIPermission@@@@UnsTArrayInfallibleAllocator@@@@IEAAPEAV?$RefPtr@VnsIPermission@@@@AEAV?$nsCOMPtr@VnsIPermission@@@@@Z
 ?Release@nsPermission@@UEAAKXZ
 ?extensions_cookiesBehavior_overrideOnTopLevel@StaticPrefs@mozilla@@SA_NXZ
 ?GetChannelId@HttpBaseChannel@net@mozilla@@UEAA?AW4nsresult@@PEA_K@Z
 ??$?0PEAV?$nsTArray@V?$function@$$A6AXXZ@std@@@@V?$DefaultDelete@V?$nsTArray@V?$function@$$A6AXXZ@std@@@@@mozilla@@@?$PairHelper@PEAV?$nsTArray@V?$function@$$A6AXXZ@std@@@@V?$DefaultDelete@V?$nsTArray@V?$function@$$A6AXXZ@std@@@@@mozilla@@$00$0A@@detail@mozilla@@IEAA@$$QEAPEAV?$nsTArray@V?$function@$$A6AXXZ@std@@@@$$QEAV?$DefaultDelete@V?$nsTArray@V?$function@$$A6AXXZ@std@@@@@2@@Z
-?OnAntiTrackingSettingsChanged@AntiTrackingCommon@mozilla@@SAXAEBV?$function@$$A6AXXZ@std@@@Z
 ?first@?$PairHelper@PEAV?$nsTArray@V?$function@$$A6AXXZ@std@@@@V?$DefaultDelete@V?$nsTArray@V?$function@$$A6AXXZ@std@@@@@mozilla@@$00$0A@@detail@mozilla@@IEBAAEBQEAV?$nsTArray@V?$function@$$A6AXXZ@std@@@@XZ
 ?reset@?$UniquePtr@V?$nsTArray@V?$function@$$A6AXXZ@std@@@@V?$DefaultDelete@V?$nsTArray@V?$function@$$A6AXXZ@std@@@@@mozilla@@@mozilla@@QEAAXPEAV?$nsTArray@V?$function@$$A6AXXZ@std@@@@@Z
 ??$AppendElement@AEBV?$function@$$A6AXXZ@std@@UnsTArrayInfallibleAllocator@@@?$nsTArray_Impl@V?$function@$$A6AXXZ@std@@UnsTArrayInfallibleAllocator@@@@IEAAPEAV?$function@$$A6AXXZ@std@@AEBV12@@Z
 ??$EnsureCapacity@UnsTArrayInfallibleAllocator@@@?$nsTArray_base@UnsTArrayInfallibleAllocator@@U?$nsTArray_CopyWithConstructors@V?$function@$$A6AXXZ@std@@@@@@IEAA?AUnsTArrayInfallibleResult@@_K0@Z
-?IsOnContentBlockingAllowList@AntiTrackingCommon@mozilla@@SA?AW4nsresult@@PEAVnsIURI@@_NW4ContentBlockingAllowListPurpose@12@AEA_N@Z
 ?TestPermissionOriginNoSuffix@nsPermissionManager@@UEAA?AW4nsresult@@AEBV?$nsTSubstring@D@@0PEAI@Z
 ?NS_IsSafeTopLevelNav@@YA_NPEAVnsIChannel@@@Z
 ?IsSafeMethod@nsHttpRequestHead@net@mozilla@@QEAA_NXZ
 ?NS_IsSameSiteForeign@@YA_NPEAVnsIChannel@@PEAVnsIURI@@@Z
 ?GetCookieStringInternal@nsCookieService@@IEAAXPEAVnsIURI@@PEAVnsIChannel@@_N22222AEBVOriginAttributes@mozilla@@AEAV?$nsTString@D@@@Z
 ?GetCookiesForURI@nsCookieService@@QEAAXPEAVnsIURI@@PEAVnsIChannel@@_N22222AEBVOriginAttributes@mozilla@@AEAV?$nsTArray@PEAVnsCookie@@@@@Z
 ?EnsureReadComplete@nsCookieService@@IEAAX_N@Z
 ?GetBaseDomain@nsCookieService@@SA?AW4nsresult@@PEAVnsIEffectiveTLDService@@PEAVnsIURI@@AEAV?$nsTString@D@@AEA_N@Z
@@ -26330,17 +26326,16 @@ UnregisterWeakMemoryReporter
 ?nsStringInputStreamConstructor@@YA?AW4nsresult@@PEAVnsISupports@@AEBUnsID@@PEAPEAX@Z
 ?SetData@nsStringInputStream@@UEAA?AW4nsresult@@PEBDH@Z
 ?SetUploadStream@HttpBaseChannel@net@mozilla@@UEAA?AW4nsresult@@PEAVnsIInputStream@@AEBV?$nsTSubstring@D@@_J@Z
 ?ExplicitSetUploadStream@HttpBaseChannel@net@mozilla@@UEAA?AW4nsresult@@PEAVnsIInputStream@@AEBV?$nsTSubstring@D@@_J1_N@Z
 ?GetSyncLength@InputStreamLengthHelper@mozilla@@SA_NPEAVnsIInputStream@@PEA_J@Z
 ?ExplicitSetUploadStreamLength@HttpBaseChannel@net@mozilla@@AEAA?AW4nsresult@@_K_N@Z
 ??$ReplaceChar@_SX@?$nsTString@_S@@QEAAXPEBD_S@Z
 ?Set@URLParams@dom@mozilla@@QEAAXAEBV?$nsTSubstring@_S@@0@Z
-?NotifyBlockingDecision@AntiTrackingCommon@mozilla@@SAXPEAVnsIChannel@@W4BlockingDecision@12@I@Z
 ?ConstructorEnabled@ChannelWrapper_Binding@dom@mozilla@@YA_NPEAUJSContext@@V?$Handle@PEAVJSObject@@@JS@@@Z
 ?CreateInterfaceObjects@ChannelWrapper_Binding@dom@mozilla@@YAXPEAUJSContext@@V?$Handle@PEAVJSObject@@@JS@@AEAVProtoAndIfaceCache@23@_N@Z
 ?Id@ChannelWrapper@extensions@mozilla@@QEBA_KXZ
 ?Get@ChannelWrapper@extensions@mozilla@@SA?AU?$already_AddRefed@VChannelWrapper@extensions@mozilla@@@@AEBVGlobalObject@dom@3@PEAVnsIChannel@@@Z
 ??0ChannelWrapper@extensions@mozilla@@AEAA@PEAVnsISupports@@PEAVnsIChannel@@@Z
 ??0?$RefPtr@VChannelWrapper@extensions@mozilla@@@@QEAA@PEAVChannelWrapper@extensions@mozilla@@@Z
 ?assign_with_AddRef@?$RefPtr@VChannelWrapper@extensions@mozilla@@@@AEAAXPEAVChannelWrapper@extensions@mozilla@@@Z
 ?AddRef@ChannelWrapper@extensions@mozilla@@UEAAKXZ
@@ -26665,17 +26660,16 @@ Gecko_AppendPropertyValuePair
 ?ParseMetaDataEntry@Predictor@net@mozilla@@AEAA_NPEBD0AEAV?$nsTString@D@@AEAI22@Z
 ?PreloadImage@nsHtml5TreeOpExecutor@@QEAAXAEBV?$nsTSubstring@_S@@0000@Z
 ?ResolvePreloadImage@Document@dom@mozilla@@QEAA?AU?$already_AddRefed@VnsIURI@@@@PEAVnsIURI@@AEBV?$nsTSubstring@_S@@11PEA_N@Z
 ?SelectSourceForTagWithAttrs@HTMLImageElement@dom@mozilla@@SA_NPEAVDocument@23@_NAEBV?$nsTSubstring@_S@@2222AEAV5@@Z
 ?MaybePreLoadImage@Document@dom@mozilla@@QEAAXPEAVnsIURI@@AEBV?$nsTSubstring@_S@@W4ReferrerPolicy@net@3@_N@Z
 ?IsImageInCache@nsContentUtils@@SA_NPEAVnsIURI@@PEAVDocument@dom@mozilla@@@Z
 ?FindEntryProperties@imgLoader@@UEAA?AW4nsresult@@PEAVnsIURI@@PEAVDocument@dom@mozilla@@PEAPEAVnsIProperties@@@Z
 ?IsThirdPartyTrackingResourceWindow@nsContentUtils@@SA_NPEAVnsPIDOMWindowInner@@@Z
-?MaybeIsFirstPartyStorageAccessGrantedFor@AntiTrackingCommon@mozilla@@SA_NPEAVnsPIDOMWindowInner@@PEAVnsIURI@@@Z
 ??$CreateAndResolve@_N@?$MozPromise@H_N$00@mozilla@@SA?AV?$RefPtr@V?$MozPromise@H_N$00@mozilla@@@@$$QEA_NPEBD@Z
 ?AdjustPriority@HttpBaseChannel@net@mozilla@@UEAA?AW4nsresult@@H@Z
 ?SetTimingEnabled@imgRequestProxy@@UEAA?AW4nsresult@@_N@Z
 ?s_HashKey@?$nsTHashtable@V?$nsBaseHashtableET@VnsURIHashKey@@V?$RefPtr@VimgIRequest@@@@@@@@KAIPEBX@Z
 ?s_InitEntry@?$nsTHashtable@V?$nsBaseHashtableET@VnsURIHashKey@@V?$RefPtr@VimgIRequest@@@@@@@@KAXPEAUPLDHashEntryHdr@@PEBX@Z
 ?UpdateEffectProperties@EffectCompositor@mozilla@@QEAAXPEBVComputedStyle@2@PEAVElement@dom@2@W4PseudoStyleType@2@@Z
 ??$?8UnsTArrayInfallibleAllocator@@@?$nsTArray_Impl@UAnimationPropertySegment@mozilla@@UnsTArrayInfallibleAllocator@@@@QEBA_NAEBV0@@Z
 ??8AnimationPropertySegment@mozilla@@QEBA_NAEBU01@@Z
--- a/dom/base/Document.cpp
+++ b/dom/base/Document.cpp
@@ -6,21 +6,21 @@
 
 /*
  * Base class for all our document implementations.
  */
 
 #include "AudioChannelService.h"
 #include "mozilla/dom/Document.h"
 #include "DocumentInlines.h"
-#include "mozilla/AntiTrackingCommon.h"
 #include "mozilla/AntiTrackingUtils.h"
 #include "mozilla/ArrayUtils.h"
 #include "mozilla/AutoRestore.h"
 #include "mozilla/BinarySearch.h"
+#include "mozilla/ContentBlocking.h"
 #include "mozilla/ContentBlockingAllowList.h"
 #include "mozilla/ContentBlockingUserInteraction.h"
 #include "mozilla/CSSEnabledState.h"
 #include "mozilla/DebugOnly.h"
 #include "mozilla/EditorCommands.h"
 #include "mozilla/EffectSet.h"
 #include "mozilla/EnumSet.h"
 #include "mozilla/HTMLEditor.h"
@@ -15061,17 +15061,17 @@ void Document::MaybeAllowStorageForOpene
   // should not continue.
   if (!nsContentUtils::IsThirdPartyWindowOrChannel(inner, nullptr, openerURI) &&
       !nsContentUtils::IsThirdPartyWindowOrChannel(openerInner, nullptr,
                                                    nullptr)) {
     return;
   }
 
   // We don't care when the asynchronous work finishes here.
-  Unused << AntiTrackingCommon::AddFirstPartyStorageAccessGrantedFor(
+  Unused << ContentBlocking::AllowAccessFor(
       NodePrincipal(), openerInner,
       ContentBlockingNotifier::eOpenerAfterUserInteraction);
 }
 
 namespace {
 
 // Documents can stay alive for days. We don't want to update the permission
 // value at any user-interaction, and, using a timer triggered any X seconds
@@ -15634,29 +15634,30 @@ already_AddRefed<mozilla::dom::Promise> 
       DebugOnly<bool> isOnAllowList = false;
       MOZ_ASSERT_IF(NS_SUCCEEDED(ContentBlockingAllowList::Check(
                         parent->GetContentBlockingAllowListPrincipal(), false,
                         isOnAllowList)),
                     !isOnAllowList);
 
       RefPtr<Document> self(this);
 
-      auto performFinalChecks = [inner, self]()
-          -> RefPtr<AntiTrackingCommon::StorageAccessFinalCheckPromise> {
-        RefPtr<AntiTrackingCommon::StorageAccessFinalCheckPromise::Private> p =
-            new AntiTrackingCommon::StorageAccessFinalCheckPromise::Private(
+      auto performFinalChecks =
+          [inner,
+           self]() -> RefPtr<ContentBlocking::StorageAccessFinalCheckPromise> {
+        RefPtr<ContentBlocking::StorageAccessFinalCheckPromise::Private> p =
+            new ContentBlocking::StorageAccessFinalCheckPromise::Private(
                 __func__);
         RefPtr<StorageAccessPermissionRequest> sapr =
             StorageAccessPermissionRequest::Create(
                 inner,
                 // Allow
                 [p] {
                   Telemetry::AccumulateCategorical(
                       Telemetry::LABELS_STORAGE_ACCESS_API_UI::Allow);
-                  p->Resolve(AntiTrackingCommon::eAllow, __func__);
+                  p->Resolve(ContentBlocking::eAllow, __func__);
                 },
                 // Block
                 [p] {
                   Telemetry::AccumulateCategorical(
                       Telemetry::LABELS_STORAGE_ACCESS_API_UI::Deny);
                   p->Reject(false, __func__);
                 });
 
@@ -15691,20 +15692,20 @@ already_AddRefed<mozilla::dom::Promise> 
                     Telemetry::LABELS_STORAGE_ACCESS_API_UI::
                         AllowAutomatically);
               }
 
               if (pr2 != PromptResult::Pending) {
                 MOZ_ASSERT_IF(pr2 != PromptResult::Granted,
                               pr2 == PromptResult::Denied);
                 if (pr2 == PromptResult::Granted) {
-                  AntiTrackingCommon::StorageAccessPromptChoices choice =
-                      AntiTrackingCommon::eAllow;
+                  ContentBlocking::StorageAccessPromptChoices choice =
+                      ContentBlocking::eAllow;
                   if (autoGrant) {
-                    choice = AntiTrackingCommon::eAllowAutoGrant;
+                    choice = ContentBlocking::eAllowAutoGrant;
                   }
                   if (!autoGrant) {
                     p->Resolve(choice, __func__);
                   } else {
                     sapr->MaybeDelayAutomaticGrants()->Then(
                         GetCurrentThreadSerialEventTarget(), __func__,
                         [p, choice] { p->Resolve(choice, __func__); },
                         [p] { p->Reject(false, __func__); });
@@ -15717,17 +15718,17 @@ already_AddRefed<mozilla::dom::Promise> 
 
               sapr->RequestDelayedTask(
                   inner->EventTargetFor(TaskCategory::Other),
                   ContentPermissionRequestBase::DelayedTaskType::Request);
             });
 
         return std::move(p);
       };
-      AntiTrackingCommon::AddFirstPartyStorageAccessGrantedFor(
+      ContentBlocking::AllowAccessFor(
           NodePrincipal(), inner, ContentBlockingNotifier::eStorageAccessAPI,
           performFinalChecks)
           ->Then(
               GetCurrentThreadSerialEventTarget(), __func__,
               [outer, promise] {
                 // Step 10. Grant the document access to cookies and store
                 // that fact for
                 //          the purposes of future calls to
@@ -16041,21 +16042,21 @@ nsIPrincipal* Document::EffectiveStorage
     return NodePrincipal();
   }
 
   // Return our cached storage principal if one exists.
   if (mActiveStoragePrincipal) {
     return mActiveStoragePrincipal;
   }
 
-  // We use the lower-level AntiTrackingCommon API here to ensure this
+  // We use the lower-level ContentBlocking API here to ensure this
   // check doesn't send notifications.
   uint32_t rejectedReason = 0;
-  if (AntiTrackingCommon::IsFirstPartyStorageAccessGrantedFor(
-          inner, GetDocumentURI(), &rejectedReason)) {
+  if (ContentBlocking::ShouldAllowAccessFor(inner, GetDocumentURI(),
+                                            &rejectedReason)) {
     return mActiveStoragePrincipal = NodePrincipal();
   }
 
   // Let's use the storage principal only if we need to partition the cookie
   // jar. When the permission is granted, access will be different and the
   // normal principal will be used.
   if (ShouldPartitionStorage(rejectedReason) &&
       !StoragePartitioningEnabled(
--- a/dom/base/Navigator.cpp
+++ b/dom/base/Navigator.cpp
@@ -6,17 +6,17 @@
 
 // Needs to be first.
 #include "base/basictypes.h"
 
 #include "Navigator.h"
 #include "nsIXULAppInfo.h"
 #include "nsPluginArray.h"
 #include "nsMimeTypeArray.h"
-#include "mozilla/AntiTrackingCommon.h"
+#include "mozilla/ContentBlocking.h"
 #include "mozilla/ContentBlockingNotifier.h"
 #include "mozilla/MemoryReporting.h"
 #include "mozilla/dom/BodyExtractor.h"
 #include "mozilla/dom/FetchBinding.h"
 #include "mozilla/dom/File.h"
 #include "Geolocation.h"
 #include "nsIClassOfService.h"
 #include "nsIHttpProtocolHandler.h"
@@ -523,18 +523,18 @@ bool Navigator::CookieEnabled() {
 
   if (!contentURI) {
     // Not a content, so technically can't set cookies, but let's
     // just return the default value.
     return cookieEnabled;
   }
 
   uint32_t rejectedReason = 0;
-  bool granted = AntiTrackingCommon::IsFirstPartyStorageAccessGrantedFor(
-      mWindow, contentURI, &rejectedReason);
+  bool granted = ContentBlocking::ShouldAllowAccessFor(mWindow, contentURI,
+                                                       &rejectedReason);
 
   ContentBlockingNotifier::OnDecision(
       mWindow,
       granted ? ContentBlockingNotifier::BlockingDecision::eAllow
               : ContentBlockingNotifier::BlockingDecision::eBlock,
       rejectedReason);
   return granted;
 }
--- a/dom/base/ThirdPartyUtil.cpp
+++ b/dom/base/ThirdPartyUtil.cpp
@@ -14,16 +14,17 @@
 #include "nsIHttpChannelInternal.h"
 #include "nsILoadContext.h"
 #include "nsIPrincipal.h"
 #include "nsIScriptObjectPrincipal.h"
 #include "nsIURI.h"
 #include "nsReadableUtils.h"
 #include "nsThreadUtils.h"
 #include "mozilla/ClearOnShutdown.h"
+#include "mozilla/ContentBlocking.h"
 #include "mozilla/ContentBlockingAllowList.h"
 #include "mozilla/dom/Document.h"
 #include "mozilla/Logging.h"
 #include "mozilla/StaticPtr.h"
 #include "mozilla/TextUtils.h"
 #include "mozilla/Unused.h"
 #include "nsGlobalWindowOuter.h"
 
@@ -488,18 +489,18 @@ ThirdPartyUtil::AnalyzeChannel(nsIChanne
     // foreign cookie behavior mode.
 
     // If the caller has requested third-party checks, we will only perform the
     // storage access check once we know we're in the third-party context.
     bool performStorageChecks =
         aRequireThirdPartyCheck ? result.contains(ThirdPartyAnalysis::IsForeign)
                                 : true;
     if (performStorageChecks &&
-        AntiTrackingCommon::IsFirstPartyStorageAccessGrantedFor(
-            aChannel, aURI ? aURI : uri.get(), aRejectedReason)) {
+        ContentBlocking::ShouldAllowAccessFor(aChannel, aURI ? aURI : uri.get(),
+                                              aRejectedReason)) {
       result += ThirdPartyAnalysis::IsFirstPartyStorageAccessGranted;
     }
 
     if (aNotify && !result.contains(
                        ThirdPartyAnalysis::IsFirstPartyStorageAccessGranted)) {
       ContentBlockingNotifier::OnDecision(
           aChannel, ContentBlockingNotifier::BlockingDecision::eBlock,
           *aRejectedReason);
--- a/dom/base/nsContentUtils.cpp
+++ b/dom/base/nsContentUtils.cpp
@@ -28,17 +28,16 @@
 #include "Layers.h"
 #include "nsAppRunner.h"
 // nsNPAPIPluginInstance must be included before mozilla/dom/Document.h, which
 // is included in mozAutoDocUpdate.h.
 #include "nsNPAPIPluginInstance.h"
 #include "gfxDrawable.h"
 #include "ImageOps.h"
 #include "mozAutoDocUpdate.h"
-#include "mozilla/AntiTrackingCommon.h"
 #include "mozilla/net/UrlClassifierCommon.h"
 #include "mozilla/ArrayUtils.h"
 #include "mozilla/Attributes.h"
 #include "mozilla/AutoRestore.h"
 #include "mozilla/AutoTimelineMarker.h"
 #include "mozilla/BackgroundHangMonitor.h"
 #include "mozilla/Base64.h"
 #include "mozilla/BasePrincipal.h"
--- a/dom/base/nsGlobalWindowInner.cpp
+++ b/dom/base/nsGlobalWindowInner.cpp
@@ -4395,18 +4395,18 @@ Storage* nsGlobalWindowInner::GetSession
 
     // SessionStorage is an ephemeral per-tab per-origin storage that only lives
     // as long as the tab is open, although it may survive browser restarts
     // thanks to the session store. So we interpret storage access differently
     // than we would for persistent per-origin storage like LocalStorage and so
     // it may be okay to provide SessionStorage even when we receive a value of
     // eDeny.
     //
-    // AntiTrackingCommon::IsFirstPartyStorageAccessGranted will return false
-    // for 3 main reasons.
+    // ContentBlocking::ShouldAllowAccessFor will return false for 3 main
+    // reasons.
     //
     // 1. Cookies are entirely blocked due to a per-origin permission
     // (nsICookiePermission::ACCESS_DENY for the top-level principal or this
     // window's principal) or the very broad BEHAVIOR_REJECT. This will return
     // eDeny with a reason of STATE_COOKIES_BLOCKED_BY_PERMISSION or
     // STATE_COOKIES_BLOCKED_ALL.
     //
     // 2. Third-party cookies are limited via BEHAVIOR_REJECT_FOREIGN and
--- a/dom/base/nsGlobalWindowOuter.cpp
+++ b/dom/base/nsGlobalWindowOuter.cpp
@@ -16,18 +16,18 @@
 #include "nsScreen.h"
 #include "nsHistory.h"
 #include "nsDOMNavigationTiming.h"
 #include "nsIDOMStorageManager.h"
 #include "nsIPermission.h"
 #include "nsIPermissionManager.h"
 #include "nsISecureBrowserUI.h"
 #include "nsIWebProgressListener.h"
-#include "mozilla/AntiTrackingCommon.h"
 #include "mozilla/AntiTrackingUtils.h"
+#include "mozilla/ContentBlocking.h"
 #include "mozilla/dom/BindingUtils.h"
 #include "mozilla/dom/BrowserChild.h"
 #include "mozilla/dom/BrowsingContextBinding.h"
 #include "mozilla/dom/ContentFrameMessageManager.h"
 #include "mozilla/dom/EventTarget.h"
 #include "mozilla/dom/LocalStorage.h"
 #include "mozilla/dom/LSObject.h"
 #include "mozilla/dom/Storage.h"
@@ -2477,18 +2477,18 @@ nsresult nsGlobalWindowOuter::SetNewDocu
       aDocument->CookieJarSettings()->GetRejectThirdPartyTrackers() &&
       nsContentUtils::IsThirdPartyWindowOrChannel(newInnerWindow, nullptr,
                                                   uri) &&
       nsContentUtils::IsThirdPartyTrackingResourceWindow(newInnerWindow)) {
     // Grant storage access by default if the first-party storage access
     // permission has been granted already.
     // Don't notify in this case, since we would be notifying the user
     // needlessly.
-    mHasStorageAccess = AntiTrackingCommon::IsFirstPartyStorageAccessGrantedFor(
-        newInnerWindow, uri, nullptr);
+    mHasStorageAccess =
+        ContentBlocking::ShouldAllowAccessFor(newInnerWindow, uri, nullptr);
   }
 
   return NS_OK;
 }
 
 /* static */
 void nsGlobalWindowOuter::PrepareForProcessChange(JSObject* aProxy) {
   JS::Rooted<JSObject*> localProxy(RootingCx(), aProxy);
@@ -7179,18 +7179,18 @@ void nsGlobalWindowOuter::MaybeAllowStor
   Document* doc = inner->GetDoc();
   if (!doc) {
     return;
   }
   nsCOMPtr<nsIPrincipal> principal = BasePrincipal::CreateContentPrincipal(
       aURI, doc->NodePrincipal()->OriginAttributesRef());
 
   // We don't care when the asynchronous work finishes here.
-  Unused << AntiTrackingCommon::AddFirstPartyStorageAccessGrantedFor(
-      principal, inner, ContentBlockingNotifier::eOpener);
+  Unused << ContentBlocking::AllowAccessFor(principal, inner,
+                                            ContentBlockingNotifier::eOpener);
 }
 
 //*****************************************************************************
 // nsGlobalWindowOuter: Helper Functions
 //*****************************************************************************
 
 already_AddRefed<nsIDocShellTreeOwner> nsPIDOMWindowOuter::GetTreeOwner() {
   // If there's no docShellAsItem, this window must have been closed,
--- a/dom/base/nsPIDOMWindow.h
+++ b/dom/base/nsPIDOMWindow.h
@@ -8,17 +8,16 @@
 #define nsPIDOMWindow_h__
 
 #include "nsIDOMWindow.h"
 #include "mozIDOMWindow.h"
 
 #include "nsCOMPtr.h"
 #include "nsTArray.h"
 #include "mozilla/dom/EventTarget.h"
-#include "mozilla/AntiTrackingCommon.h"
 #include "mozilla/Maybe.h"
 #include "mozilla/TaskCategory.h"
 #include "js/TypeDecls.h"
 #include "nsRefPtrHashtable.h"
 
 // Only fired for inner windows.
 #define DOM_WINDOW_DESTROYED_TOPIC "dom-window-destroyed"
 #define DOM_WINDOW_FROZEN_TOPIC "dom-window-frozen"
--- a/dom/ipc/ContentParent.cpp
+++ b/dom/ipc/ContentParent.cpp
@@ -35,17 +35,17 @@
 #include "MMPrinter.h"
 #include "PreallocatedProcessManager.h"
 #include "ProcessPriorityManager.h"
 #include "SandboxHal.h"
 #include "SourceSurfaceRawData.h"
 #include "URIUtils.h"
 #include "gfxPlatform.h"
 #include "gfxPlatformFontList.h"
-#include "mozilla/AntiTrackingCommon.h"
+#include "mozilla/ContentBlocking.h"
 #include "mozilla/BasePrincipal.h"
 #include "mozilla/BenchmarkStorageParent.h"
 #include "mozilla/ContentBlockingUserInteraction.h"
 #include "mozilla/ClearOnShutdown.h"
 #include "mozilla/Components.h"
 #include "mozilla/DataStorage.h"
 #include "mozilla/GlobalStyleSheetCache.h"
 #include "mozilla/HangDetails.h"
@@ -5817,27 +5817,27 @@ mozilla::ipc::IPCResult ContentParent::R
   return IPC_OK();
 }
 
 mozilla::ipc::IPCResult
 ContentParent::RecvFirstPartyStorageAccessGrantedForOrigin(
     const Principal& aParentPrincipal, const Principal& aTrackingPrincipal,
     const nsCString& aTrackingOrigin, const int& aAllowMode,
     FirstPartyStorageAccessGrantedForOriginResolver&& aResolver) {
-  AntiTrackingCommon::
-      SaveFirstPartyStorageAccessGrantedForOriginOnParentProcess(
-          aParentPrincipal, aTrackingPrincipal, aTrackingOrigin, aAllowMode)
-          ->Then(GetCurrentThreadSerialEventTarget(), __func__,
-                 [aResolver = std::move(aResolver)](
-                     AntiTrackingCommon::FirstPartyStorageAccessGrantPromise::
-                         ResolveOrRejectValue&& aValue) {
-                   bool success = aValue.IsResolve() &&
-                                  NS_SUCCEEDED(aValue.ResolveValue());
-                   aResolver(success);
-                 });
+  ContentBlocking::SaveAccessForOriginOnParentProcess(
+      aParentPrincipal, aTrackingPrincipal, aTrackingOrigin, aAllowMode)
+      ->Then(
+          GetCurrentThreadSerialEventTarget(), __func__,
+          [aResolver = std::move(aResolver)](
+              ContentBlocking::ParentAccessGrantPromise::ResolveOrRejectValue&&
+                  aValue) {
+            bool success =
+                aValue.IsResolve() && NS_SUCCEEDED(aValue.ResolveValue());
+            aResolver(success);
+          });
   return IPC_OK();
 }
 
 mozilla::ipc::IPCResult ContentParent::RecvStoreUserInteractionAsPermission(
     const Principal& aPrincipal) {
   ContentBlockingUserInteraction::Observe(aPrincipal);
   return IPC_OK();
 }
--- a/dom/security/ReferrerInfo.cpp
+++ b/dom/security/ReferrerInfo.cpp
@@ -13,18 +13,18 @@
 #include "nsIURL.h"
 
 #include "nsWhitespaceTokenizer.h"
 #include "nsAlgorithm.h"
 #include "nsContentUtils.h"
 #include "nsCharSeparatedTokenizer.h"
 #include "ReferrerInfo.h"
 
-#include "mozilla/AntiTrackingCommon.h"
 #include "mozilla/BasePrincipal.h"
+#include "mozilla/ContentBlocking.h"
 #include "mozilla/net/CookieJarSettings.h"
 #include "mozilla/net/HttpBaseChannel.h"
 #include "mozilla/dom/Element.h"
 #include "mozilla/StaticPrefs_network.h"
 #include "mozilla/StyleSheet.h"
 
 static mozilla::LazyLogModule gReferrerInfoLog("ReferrerInfo");
 #define LOG(msg) MOZ_LOG(gReferrerInfoLog, mozilla::LogLevel::Debug, msg)
@@ -200,18 +200,17 @@ ReferrerPolicy ReferrerInfo::GetDefaultR
     Unused << loadInfo->GetCookieJarSettings(getter_AddRefs(cjs));
   }
   if (!cjs) {
     cjs = net::CookieJarSettings::Create();
   }
   if (aChannel && aURI && cjs->GetRejectThirdPartyTrackers()) {
     uint32_t rejectedReason = 0;
     thirdPartyTrackerIsolated =
-        !AntiTrackingCommon::IsFirstPartyStorageAccessGrantedFor(
-            aChannel, aURI, &rejectedReason);
+        !ContentBlocking::ShouldAllowAccessFor(aChannel, aURI, &rejectedReason);
     // Here we intentionally do not notify about the rejection reason, if any
     // in order to avoid this check to have any visible side-effects (e.g. a
     // web console report.)
   }
 
   uint32_t defaultToUse;
   if (thirdPartyTrackerIsolated) {
     if (privateBrowsing) {
--- a/dom/workers/RuntimeService.cpp
+++ b/dom/workers/RuntimeService.cpp
@@ -20,17 +20,16 @@
 
 #include <algorithm>
 #include "mozilla/ipc/BackgroundChild.h"
 #include "GeckoProfiler.h"
 #include "jsfriendapi.h"
 #include "js/ContextOptions.h"
 #include "js/LocaleSensitive.h"
 #include "mozilla/AbstractThread.h"
-#include "mozilla/AntiTrackingCommon.h"
 #include "mozilla/ArrayUtils.h"
 #include "mozilla/Atomics.h"
 #include "mozilla/Attributes.h"
 #include "mozilla/CycleCollectedJSContext.h"
 #include "mozilla/CycleCollectedJSRuntime.h"
 #include "mozilla/Telemetry.h"
 #include "mozilla/TimeStamp.h"
 #include "mozilla/dom/AtomList.h"
--- a/image/ImageCacheKey.cpp
+++ b/image/ImageCacheKey.cpp
@@ -2,17 +2,17 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "ImageCacheKey.h"
 
 #include <utility>
 
-#include "mozilla/AntiTrackingCommon.h"
+#include "mozilla/ContentBlocking.h"
 #include "mozilla/HashFunctions.h"
 #include "mozilla/StorageAccess.h"
 #include "mozilla/Unused.h"
 #include "mozilla/dom/BlobURLProtocolHandler.h"
 #include "mozilla/dom/Document.h"
 #include "mozilla/dom/File.h"
 #include "mozilla/dom/ServiceWorkerManager.h"
 #include "nsContentUtils.h"
@@ -180,17 +180,17 @@ nsCString ImageCacheKey::GetTopLevelBase
   }
 
   // Another scenario is if this image is a 3rd party resource loaded by a
   // first party context. In this case, we should check if the nsIChannel has
   // been marked as tracking resource, but we don't have the channel yet at
   // 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 (!AntiTrackingCommon::MaybeIsFirstPartyStorageAccessGrantedFor(
+  if (!ContentBlocking::ApproximateAllowAccessForWithoutChannel(
           aDocument->GetInnerWindow(), aURI)) {
     nsPIDOMWindowOuter* top =
         aDocument->GetInnerWindow()->GetInProcessScriptableTop();
     nsPIDOMWindowInner* topInner = top ? top->GetCurrentInnerWindow() : nullptr;
     if (!topInner) {
       return aDocument
           ->GetBaseDomain();  // because we don't have anything better!
     }
--- a/media/webrtc/signaling/src/peerconnection/RTCStatsReport.h
+++ b/media/webrtc/signaling/src/peerconnection/RTCStatsReport.h
@@ -13,16 +13,17 @@
 #include "nsPIDOMWindow.h"               // nsPIDOMWindowInner
 #include "mozilla/dom/ScriptSettings.h"  // AutoEntryScript
 #include "nsIGlobalObject.h"
 #include "js/RootingAPI.h"  // JS::Rooted
 #include "js/Value.h"
 #include "mozilla/ErrorResult.h"
 #include "mozilla/UniquePtr.h"
 #include "prtime.h"  // PR_Now
+#include "mozilla/MozPromise.h"
 #include "mozilla/TimeStamp.h"
 #include "mozilla/dom/RTCStatsReportBinding.h"  // RTCStatsCollection
 
 namespace mozilla {
 namespace dom {
 
 class RTCStatsTimestampMaker {
  public:
--- a/netwerk/base/nsNetUtil.cpp
+++ b/netwerk/base/nsNetUtil.cpp
@@ -4,17 +4,16 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 // HttpLog.h should generally be included first
 #include "HttpLog.h"
 
 #include "nsNetUtil.h"
 
-#include "mozilla/AntiTrackingCommon.h"
 #include "mozilla/Atomics.h"
 #include "mozilla/Encoding.h"
 #include "mozilla/LoadContext.h"
 #include "mozilla/LoadInfo.h"
 #include "mozilla/BasePrincipal.h"
 #include "mozilla/Monitor.h"
 #include "mozilla/StaticPrefs_network.h"
 #include "mozilla/StaticPrefs_privacy.h"
--- a/netwerk/cookie/CookieServiceChild.cpp
+++ b/netwerk/cookie/CookieServiceChild.cpp
@@ -1,16 +1,15 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "mozilla/net/CookieServiceChild.h"
 #include "mozilla/net/NeckoChannelParams.h"
-#include "mozilla/AntiTrackingCommon.h"
 #include "mozilla/LoadInfo.h"
 #include "mozilla/BasePrincipal.h"
 #include "mozilla/ClearOnShutdown.h"
 #include "mozilla/dom/ContentChild.h"
 #include "mozilla/ipc/URIUtils.h"
 #include "mozilla/net/NeckoChild.h"
 #include "mozilla/StaticPrefs_network.h"
 #include "mozilla/SystemGroup.h"
--- a/netwerk/protocol/http/ClassifierDummyChannel.cpp
+++ b/netwerk/protocol/http/ClassifierDummyChannel.cpp
@@ -2,17 +2,17 @@
 /* vim: set sw=2 ts=8 et tw=80 : */
 
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "ClassifierDummyChannel.h"
 
-#include "mozilla/AntiTrackingCommon.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 "nsContentSecurityManager.h"
 #include "nsIChannel.h"
 #include "nsIURI.h"
@@ -55,18 +55,17 @@ ClassifierDummyChannel::StorageAllowed(
 
     if (!ClassifierDummyChannelChild::Create(httpChannel, uri, aCallback)) {
       return eStorageDenied;
     }
 
     return eAsyncNeeded;
   }
 
-  if (AntiTrackingCommon::IsFirstPartyStorageAccessGrantedFor(httpChannel, uri,
-                                                              nullptr)) {
+  if (ContentBlocking::ShouldAllowAccessFor(httpChannel, uri, nullptr)) {
     return eStorageGranted;
   }
 
   return eStorageDenied;
 }
 
 NS_IMPL_ADDREF(ClassifierDummyChannel)
 NS_IMPL_RELEASE(ClassifierDummyChannel)
--- a/netwerk/protocol/http/ClassifierDummyChannelChild.cpp
+++ b/netwerk/protocol/http/ClassifierDummyChannelChild.cpp
@@ -1,15 +1,16 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* vim: set ts=8 sts=2 et sw=2 tw=80: */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * 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"
 
 namespace mozilla {
 namespace net {
 
 /* static */
@@ -80,16 +81,16 @@ mozilla::ipc::IPCResult ClassifierDummyC
     return IPC_OK();
   }
 
   nsCOMPtr<nsIHttpChannel> channel = std::move(mChannel);
 
   RefPtr<HttpBaseChannel> httpChannel = do_QueryObject(channel);
   httpChannel->AddClassificationFlags(aClassificationFlags, mIsThirdParty);
 
-  bool storageGranted = AntiTrackingCommon::IsFirstPartyStorageAccessGrantedFor(
-      httpChannel, mURI, nullptr);
+  bool storageGranted =
+      ContentBlocking::ShouldAllowAccessFor(httpChannel, mURI, nullptr);
   mCallback(storageGranted);
   return IPC_OK();
 }
 
 }  // namespace net
 }  // namespace mozilla
--- a/netwerk/protocol/http/HttpChannelChild.cpp
+++ b/netwerk/protocol/http/HttpChannelChild.cpp
@@ -5,17 +5,16 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 // HttpLog.h should generally be included first
 #include "HttpLog.h"
 
 #include "nsHttp.h"
 #include "nsICacheEntry.h"
-#include "mozilla/AntiTrackingCommon.h"
 #include "mozilla/BasePrincipal.h"
 #include "mozilla/Unused.h"
 #include "mozilla/dom/ContentChild.h"
 #include "mozilla/dom/DocGroup.h"
 #include "mozilla/dom/ServiceWorkerUtils.h"
 #include "mozilla/dom/BrowserChild.h"
 #include "mozilla/dom/TabGroup.h"
 #include "mozilla/extensions/StreamFilterParent.h"
--- a/netwerk/protocol/http/nsHttpChannel.cpp
+++ b/netwerk/protocol/http/nsHttpChannel.cpp
@@ -50,19 +50,19 @@
 #include "mozilla/TimeStamp.h"
 #include "nsError.h"
 #include "nsPrintfCString.h"
 #include "nsAlgorithm.h"
 #include "nsQueryObject.h"
 #include "nsThreadUtils.h"
 #include "GeckoProfiler.h"
 #include "nsIConsoleService.h"
-#include "mozilla/AntiTrackingCommon.h"
 #include "mozilla/Attributes.h"
 #include "mozilla/BasePrincipal.h"
+#include "mozilla/ContentBlocking.h"
 #include "mozilla/DebugOnly.h"
 #include "mozilla/Preferences.h"
 #include "mozilla/Services.h"
 #include "mozilla/StaticPrefs_browser.h"
 #include "mozilla/StaticPrefs_fission.h"
 #include "mozilla/StaticPrefs_network.h"
 #include "mozilla/StaticPrefs_privacy.h"
 #include "mozilla/StaticPrefs_security.h"
@@ -4020,18 +4020,17 @@ nsresult nsHttpChannel::OpenCacheEntry(b
 }
 
 bool nsHttpChannel::IsIsolated() {
   if (mHasBeenIsolatedChecked) {
     return mIsIsolated;
   }
   mIsIsolated = StaticPrefs::browser_cache_cache_isolation() ||
                 (IsThirdPartyTrackingResource() &&
-                 !AntiTrackingCommon::IsFirstPartyStorageAccessGrantedFor(
-                     this, mURI, nullptr));
+                 !ContentBlocking::ShouldAllowAccessFor(this, mURI, nullptr));
   mHasBeenIsolatedChecked = true;
   return mIsIsolated;
 }
 
 const nsCString& nsHttpChannel::GetTopWindowOrigin() {
   if (mTopWindowOriginComputed) {
     return mTopWindowOrigin;
   }
--- a/netwerk/url-classifier/UrlClassifierCommon.h
+++ b/netwerk/url-classifier/UrlClassifierCommon.h
@@ -2,18 +2,18 @@
 /* vim: set ts=8 sts=2 et sw=2 tw=80: */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #ifndef mozilla_net_UrlClassifierCommon_h
 #define mozilla_net_UrlClassifierCommon_h
 
+#include "mozilla/Logging.h"
 #include "nsString.h"
-#include "mozilla/AntiTrackingCommon.h"
 
 #include <vector>
 
 class nsIChannel;
 class nsIURI;
 
 #define UC_LOG(args) MOZ_LOG(UrlClassifierCommon::sLog, LogLevel::Info, args)
 #define UC_LOG_DEBUG(args) \
--- a/netwerk/url-classifier/UrlClassifierFeatureBase.h
+++ b/netwerk/url-classifier/UrlClassifierFeatureBase.h
@@ -6,17 +6,16 @@
 
 #ifndef mozilla_net_UrlClassifierFeatureBase_h
 #define mozilla_net_UrlClassifierFeatureBase_h
 
 #include "nsIUrlClassifierFeature.h"
 #include "nsIUrlClassifierSkipListService.h"
 #include "nsTArray.h"
 #include "nsString.h"
-#include "mozilla/AntiTrackingCommon.h"
 
 namespace mozilla {
 namespace net {
 
 class UrlClassifierFeatureBase : public nsIUrlClassifierFeature,
                                  public nsIUrlClassifierSkipListObserver {
  public:
   NS_DECL_ISUPPORTS
--- a/netwerk/url-classifier/UrlClassifierFeatureCryptominingAnnotation.cpp
+++ b/netwerk/url-classifier/UrlClassifierFeatureCryptominingAnnotation.cpp
@@ -1,17 +1,16 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* vim: set ts=8 sts=2 et sw=2 tw=80: */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "UrlClassifierFeatureCryptominingAnnotation.h"
 
-#include "mozilla/AntiTrackingCommon.h"
 #include "mozilla/net/UrlClassifierCommon.h"
 #include "nsIClassifiedChannel.h"
 #include "nsContentUtils.h"
 #include "nsNetUtil.h"
 
 namespace mozilla {
 namespace net {
 
--- a/netwerk/url-classifier/UrlClassifierFeatureCryptominingProtection.cpp
+++ b/netwerk/url-classifier/UrlClassifierFeatureCryptominingProtection.cpp
@@ -1,17 +1,16 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* vim: set ts=8 sts=2 et sw=2 tw=80: */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "UrlClassifierFeatureCryptominingProtection.h"
 
-#include "mozilla/AntiTrackingCommon.h"
 #include "mozilla/net/UrlClassifierCommon.h"
 #include "mozilla/StaticPrefs_privacy.h"
 #include "nsContentUtils.h"
 #include "nsNetUtil.h"
 
 namespace mozilla {
 namespace net {
 
--- a/netwerk/url-classifier/UrlClassifierFeatureFingerprintingAnnotation.cpp
+++ b/netwerk/url-classifier/UrlClassifierFeatureFingerprintingAnnotation.cpp
@@ -1,17 +1,16 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* vim: set ts=8 sts=2 et sw=2 tw=80: */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "UrlClassifierFeatureFingerprintingAnnotation.h"
 
-#include "mozilla/AntiTrackingCommon.h"
 #include "mozilla/net/UrlClassifierCommon.h"
 #include "nsIClassifiedChannel.h"
 #include "nsContentUtils.h"
 #include "nsNetUtil.h"
 
 namespace mozilla {
 namespace net {
 
--- a/netwerk/url-classifier/UrlClassifierFeatureFingerprintingProtection.cpp
+++ b/netwerk/url-classifier/UrlClassifierFeatureFingerprintingProtection.cpp
@@ -1,17 +1,16 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* vim: set ts=8 sts=2 et sw=2 tw=80: */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "UrlClassifierFeatureFingerprintingProtection.h"
 
-#include "mozilla/AntiTrackingCommon.h"
 #include "mozilla/net/UrlClassifierCommon.h"
 #include "mozilla/StaticPrefs_privacy.h"
 #include "nsContentUtils.h"
 #include "nsNetUtil.h"
 
 namespace mozilla {
 namespace net {
 
--- a/netwerk/url-classifier/UrlClassifierFeatureSocialTrackingAnnotation.cpp
+++ b/netwerk/url-classifier/UrlClassifierFeatureSocialTrackingAnnotation.cpp
@@ -1,17 +1,16 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* vim: set ts=8 sts=2 et sw=2 tw=80: */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "UrlClassifierFeatureSocialTrackingAnnotation.h"
 
-#include "mozilla/AntiTrackingCommon.h"
 #include "mozilla/net/UrlClassifierCommon.h"
 #include "nsIClassifiedChannel.h"
 #include "nsContentUtils.h"
 #include "nsNetUtil.h"
 
 namespace mozilla {
 namespace net {
 
--- a/netwerk/url-classifier/UrlClassifierFeatureSocialTrackingProtection.cpp
+++ b/netwerk/url-classifier/UrlClassifierFeatureSocialTrackingProtection.cpp
@@ -1,17 +1,16 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* vim: set ts=8 sts=2 et sw=2 tw=80: */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "UrlClassifierFeatureSocialTrackingProtection.h"
 
-#include "mozilla/AntiTrackingCommon.h"
 #include "mozilla/net/UrlClassifierCommon.h"
 #include "mozilla/StaticPrefs_privacy.h"
 #include "nsContentUtils.h"
 #include "nsNetUtil.h"
 
 namespace mozilla {
 namespace net {
 
--- a/netwerk/url-classifier/UrlClassifierFeatureTrackingAnnotation.cpp
+++ b/netwerk/url-classifier/UrlClassifierFeatureTrackingAnnotation.cpp
@@ -2,17 +2,16 @@
 /* vim: set ts=8 sts=2 et sw=2 tw=80: */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "UrlClassifierFeatureTrackingAnnotation.h"
 
 #include "Classifier.h"
-#include "mozilla/AntiTrackingCommon.h"
 #include "mozilla/Logging.h"
 #include "mozilla/StaticPrefs_privacy.h"
 #include "mozilla/StaticPtr.h"
 #include "mozilla/net/UrlClassifierCommon.h"
 #include "nsIClassifiedChannel.h"
 #include "nsContentUtils.h"
 
 namespace mozilla {
--- a/netwerk/url-classifier/UrlClassifierFeatureTrackingProtection.cpp
+++ b/netwerk/url-classifier/UrlClassifierFeatureTrackingProtection.cpp
@@ -1,17 +1,16 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* vim: set ts=8 sts=2 et sw=2 tw=80: */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "UrlClassifierFeatureTrackingProtection.h"
 
-#include "mozilla/AntiTrackingCommon.h"
 #include "mozilla/net/UrlClassifierCommon.h"
 #include "nsContentUtils.h"
 #include "nsIHttpChannelInternal.h"
 #include "nsILoadContext.h"
 #include "nsNetUtil.h"
 
 namespace mozilla {
 namespace net {
--- a/toolkit/components/antitracking/AntiTrackingRedirectHeuristic.cpp
+++ b/toolkit/components/antitracking/AntiTrackingRedirectHeuristic.cpp
@@ -1,26 +1,27 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* vim: set ts=8 sts=2 et sw=2 tw=80: */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "AntiTrackingLog.h"
 #include "AntiTrackingRedirectHeuristic.h"
-#include "AntiTrackingCommon.h"
+#include "ContentBlocking.h"
 #include "ContentBlockingAllowList.h"
 #include "ContentBlockingUserInteraction.h"
 
 #include "mozilla/dom/BrowsingContext.h"
 #include "mozilla/dom/Document.h"
 #include "mozilla/net/UrlClassifierCommon.h"
 #include "nsContentUtils.h"
 #include "nsIChannel.h"
 #include "nsIClassifiedChannel.h"
+#include "nsICookieService.h"
 #include "nsIRedirectHistoryEntry.h"
 #include "nsIScriptError.h"
 #include "nsIURI.h"
 #include "nsPIDOMWindow.h"
 #include "nsScriptSecurityManager.h"
 
 namespace mozilla {
 
@@ -205,19 +206,17 @@ void AntiTrackingRedirectHeuristic(nsICh
       params, errorText);
   if (NS_SUCCEEDED(rv)) {
     nsContentUtils::ReportToConsoleByWindowID(
         errorText, nsIScriptError::warningFlag, ANTITRACKING_CONSOLE_CATEGORY,
         innerWindowID);
   }
 
   // We don't care about this promise because the operation is actually sync.
-  RefPtr<AntiTrackingCommon::FirstPartyStorageAccessGrantPromise> promise =
-      AntiTrackingCommon::
-          SaveFirstPartyStorageAccessGrantedForOriginOnParentProcess(
-              redirectedPrincipal, trackingPrincipal, trackingOrigin,
-              AntiTrackingCommon::StorageAccessPromptChoices::eAllow,
-              StaticPrefs::
-                  privacy_restrict3rdpartystorage_expiration_redirect());
+  RefPtr<ContentBlocking::ParentAccessGrantPromise> promise =
+      ContentBlocking::SaveAccessForOriginOnParentProcess(
+          redirectedPrincipal, trackingPrincipal, trackingOrigin,
+          ContentBlocking::StorageAccessPromptChoices::eAllow,
+          StaticPrefs::privacy_restrict3rdpartystorage_expiration_redirect());
   Unused << promise;
 }
 
 }  // namespace mozilla
rename from toolkit/components/antitracking/AntiTrackingCommon.cpp
rename to toolkit/components/antitracking/ContentBlocking.cpp
--- a/toolkit/components/antitracking/AntiTrackingCommon.cpp
+++ b/toolkit/components/antitracking/ContentBlocking.cpp
@@ -1,56 +1,35 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* vim: set ts=8 sts=2 et sw=2 tw=80: */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "AntiTrackingLog.h"
-#include "AntiTrackingCommon.h"
+#include "ContentBlocking.h"
 #include "AntiTrackingUtils.h"
 #include "TemporaryAccessGrantObserver.h"
 
 #include "mozilla/ContentBlockingAllowList.h"
 #include "mozilla/ContentBlockingUserInteraction.h"
 #include "mozilla/dom/BrowsingContext.h"
-#include "mozilla/dom/CanonicalBrowsingContext.h"
 #include "mozilla/dom/ContentChild.h"
-#include "mozilla/dom/WindowGlobalParent.h"
-#include "mozilla/net/UrlClassifierCommon.h"
-#include "mozilla/ipc/MessageChannel.h"
-#include "mozilla/AbstractThread.h"
-#include "mozilla/HashFunctions.h"
-#include "mozilla/IntegerPrintfMacros.h"
-#include "mozilla/Logging.h"
-#include "mozilla/MruCache.h"
-#include "mozilla/Pair.h"
-#include "mozilla/ScopeExit.h"
-#include "mozilla/StaticPrefs_extensions.h"
 #include "mozilla/StaticPrefs_privacy.h"
 #include "mozIThirdPartyUtil.h"
 #include "nsContentUtils.h"
 #include "nsGlobalWindowInner.h"
 #include "nsIClassifiedChannel.h"
 #include "nsICookiePermission.h"
 #include "nsICookieService.h"
-#include "nsIDocShell.h"
-#include "nsIHttpChannelInternal.h"
-#include "nsIParentChannel.h"
 #include "nsIPermission.h"
-#include "nsPermissionManager.h"
 #include "nsIPrincipal.h"
-#include "nsIRedirectHistoryEntry.h"
-#include "nsIScriptError.h"
 #include "nsIURI.h"
-#include "nsIURIFixup.h"
 #include "nsIWebProgressListener.h"
-#include "nsNetUtil.h"
-#include "nsPIDOMWindow.h"
-#include "nsPrintfCString.h"
+#include "nsPermissionManager.h"
 #include "nsScriptSecurityManager.h"
 
 namespace mozilla {
 
 LazyLogModule gAntiTrackingLog("AntiTracking");
 
 }
 
@@ -263,21 +242,21 @@ bool CheckAntiTrackingPermission(nsIPrin
     }
   }
 
   return true;
 }
 
 }  // namespace
 
-/* static */ RefPtr<AntiTrackingCommon::StorageAccessGrantPromise>
-AntiTrackingCommon::AddFirstPartyStorageAccessGrantedFor(
+/* static */ RefPtr<ContentBlocking::StorageAccessGrantPromise>
+ContentBlocking::AllowAccessFor(
     nsIPrincipal* aPrincipal, nsPIDOMWindowInner* aParentWindow,
     ContentBlockingNotifier::StorageAccessGrantedReason aReason,
-    const AntiTrackingCommon::PerformFinalChecks& aPerformFinalChecks) {
+    const ContentBlocking::PerformFinalChecks& aPerformFinalChecks) {
   MOZ_ASSERT(aParentWindow);
 
   switch (aReason) {
     case ContentBlockingNotifier::eOpener:
       if (!StaticPrefs::
               privacy_restrict3rdpartystorage_heuristic_window_open()) {
         LOG(
             ("Bailing out early because the "
@@ -483,22 +462,21 @@ AntiTrackingCommon::AddFirstPartyStorage
         pwin, channel, parentWindow->GetExtantDoc()->GetChannel(), false,
         blockReason, trackingOrigin, Some(aReason));
 
     ContentBlockingNotifier::ReportUnblockingToConsole(
         parentWindow, NS_ConvertUTF8toUTF16(trackingOrigin), aReason);
 
     if (XRE_IsParentProcess()) {
       LOG(("Saving the permission: trackingOrigin=%s", trackingOrigin.get()));
-      return SaveFirstPartyStorageAccessGrantedForOriginOnParentProcess(
-                 topLevelStoragePrincipal, trackingPrincipal, trackingOrigin,
-                 aAllowMode)
+      return SaveAccessForOriginOnParentProcess(topLevelStoragePrincipal,
+                                                trackingPrincipal,
+                                                trackingOrigin, aAllowMode)
           ->Then(GetCurrentThreadSerialEventTarget(), __func__,
-                 [](FirstPartyStorageAccessGrantPromise::ResolveOrRejectValue&&
-                        aValue) {
+                 [](ParentAccessGrantPromise::ResolveOrRejectValue&& aValue) {
                    if (aValue.IsResolve()) {
                      return StorageAccessGrantPromise::CreateAndResolve(
                          eAllow, __func__);
                    }
                    return StorageAccessGrantPromise::CreateAndReject(false,
                                                                      __func__);
                  });
     }
@@ -540,47 +518,44 @@ AntiTrackingCommon::AddFirstPartyStorage
           }
           return StorageAccessGrantPromise::CreateAndReject(false, __func__);
         });
   }
   return storePermission(false);
 }
 
 /* static */
-RefPtr<mozilla::AntiTrackingCommon::FirstPartyStorageAccessGrantPromise>
-AntiTrackingCommon::SaveFirstPartyStorageAccessGrantedForOriginOnParentProcess(
+RefPtr<mozilla::ContentBlocking::ParentAccessGrantPromise>
+ContentBlocking::SaveAccessForOriginOnParentProcess(
     nsIPrincipal* aParentPrincipal, nsIPrincipal* aTrackingPrincipal,
     const nsCString& aTrackingOrigin, int aAllowMode,
     uint64_t aExpirationTime) {
   MOZ_ASSERT(XRE_IsParentProcess());
   MOZ_ASSERT(aAllowMode == eAllow || aAllowMode == eAllowAutoGrant);
 
   if (!aParentPrincipal || !aTrackingPrincipal) {
     LOG(("Invalid input arguments passed"));
-    return FirstPartyStorageAccessGrantPromise::CreateAndReject(false,
-                                                                __func__);
+    return ParentAccessGrantPromise::CreateAndReject(false, __func__);
   };
 
   LOG_PRIN(("Saving a first-party storage permission on %s for "
             "trackingOrigin=%s",
             _spec, aTrackingOrigin.get()),
            aParentPrincipal);
 
   if (NS_WARN_IF(!aParentPrincipal)) {
     // The child process is sending something wrong. Let's ignore it.
     LOG(("aParentPrincipal is null, bailing out early"));
-    return FirstPartyStorageAccessGrantPromise::CreateAndReject(false,
-                                                                __func__);
+    return ParentAccessGrantPromise::CreateAndReject(false, __func__);
   }
 
   nsPermissionManager* permManager = nsPermissionManager::GetInstance();
   if (NS_WARN_IF(!permManager)) {
     LOG(("Permission manager is null, bailing out early"));
-    return FirstPartyStorageAccessGrantPromise::CreateAndReject(false,
-                                                                __func__);
+    return ParentAccessGrantPromise::CreateAndReject(false, __func__);
   }
 
   // Remember that this pref is stored in seconds!
   uint32_t expirationType = nsIPermissionManager::EXPIRE_TIME;
   uint32_t expirationTime = aExpirationTime * 1000;
   int64_t when = (PR_Now() / PR_USEC_PER_MSEC) + expirationTime;
 
   uint32_t privateBrowsingId = 0;
@@ -608,21 +583,22 @@ AntiTrackingCommon::SaveFirstPartyStorag
   Unused << NS_WARN_IF(NS_FAILED(rv));
 
   if (NS_SUCCEEDED(rv) && (aAllowMode == eAllowAutoGrant)) {
     // Make sure temporary access grants do not survive more than 24 hours.
     TemporaryAccessGrantObserver::Create(permManager, aParentPrincipal, type);
   }
 
   LOG(("Result: %s", NS_SUCCEEDED(rv) ? "success" : "failure"));
-  return FirstPartyStorageAccessGrantPromise::CreateAndResolve(rv, __func__);
+  return ParentAccessGrantPromise::CreateAndResolve(rv, __func__);
 }
 
-bool AntiTrackingCommon::IsFirstPartyStorageAccessGrantedFor(
-    nsPIDOMWindowInner* aWindow, nsIURI* aURI, uint32_t* aRejectedReason) {
+bool ContentBlocking::ShouldAllowAccessFor(nsPIDOMWindowInner* aWindow,
+                                           nsIURI* aURI,
+                                           uint32_t* aRejectedReason) {
   MOZ_ASSERT(aWindow);
   MOZ_ASSERT(aURI);
 
   // Let's avoid a null check on aRejectedReason everywhere else.
   uint32_t rejectedReason = 0;
   if (!aRejectedReason) {
     aRejectedReason = &rejectedReason;
   }
@@ -814,18 +790,18 @@ bool AntiTrackingCommon::IsFirstPartySto
     return true;
   }
 
   return CheckAntiTrackingPermission(
       parentPrincipal, type, nsContentUtils::IsInPrivateBrowsing(document),
       aRejectedReason, blockedReason);
 }
 
-bool AntiTrackingCommon::IsFirstPartyStorageAccessGrantedFor(
-    nsIChannel* aChannel, nsIURI* aURI, uint32_t* aRejectedReason) {
+bool ContentBlocking::ShouldAllowAccessFor(nsIChannel* aChannel, nsIURI* aURI,
+                                           uint32_t* aRejectedReason) {
   MOZ_ASSERT(aURI);
   MOZ_ASSERT(aChannel);
 
   // Let's avoid a null check on aRejectedReason everywhere else.
   uint32_t rejectedReason = 0;
   if (!aRejectedReason) {
     aRejectedReason = &rejectedReason;
   }
@@ -1078,17 +1054,17 @@ bool AntiTrackingCommon::IsFirstPartySto
     LOG(("Failed to get the channel principal's private browsing ID"));
     return false;
   }
 
   return CheckAntiTrackingPermission(parentPrincipal, type, !!privateBrowsingId,
                                      aRejectedReason, blockedReason);
 }
 
-bool AntiTrackingCommon::IsFirstPartyStorageAccessGrantedFor(
+bool ContentBlocking::ShouldAllowAccessFor(
     nsIPrincipal* aPrincipal, nsICookieJarSettings* aCookieJarSettings) {
   MOZ_ASSERT(aPrincipal);
   MOZ_ASSERT(aCookieJarSettings);
 
   uint32_t access = nsICookiePermission::ACCESS_DEFAULT;
   if (aPrincipal->GetIsContentPrincipal()) {
     nsPermissionManager* permManager = nsPermissionManager::GetInstance();
     if (permManager) {
@@ -1101,17 +1077,17 @@ bool AntiTrackingCommon::IsFirstPartySto
     return access != nsICookiePermission::ACCESS_DENY;
   }
 
   int32_t behavior = CookiesBehavior(aPrincipal, aCookieJarSettings);
   return behavior != nsICookieService::BEHAVIOR_REJECT;
 }
 
 /* static */
-bool AntiTrackingCommon::MaybeIsFirstPartyStorageAccessGrantedFor(
+bool ContentBlocking::ApproximateAllowAccessForWithoutChannel(
     nsPIDOMWindowInner* aFirstPartyWindow, nsIURI* aURI) {
   MOZ_ASSERT(aFirstPartyWindow);
   MOZ_ASSERT(aURI);
 
   LOG_SPEC(
       ("Computing a best guess as to whether window %p has access to URI %s",
        aFirstPartyWindow, _spec),
       aURI);
rename from toolkit/components/antitracking/AntiTrackingCommon.h
rename to toolkit/components/antitracking/ContentBlocking.h
--- a/toolkit/components/antitracking/AntiTrackingCommon.h
+++ b/toolkit/components/antitracking/ContentBlocking.h
@@ -20,62 +20,53 @@ class nsIPrincipal;
 class nsIURI;
 class nsPIDOMWindowInner;
 class nsPIDOMWindowOuter;
 
 namespace mozilla {
 
 class OriginAttributes;
 
-class AntiTrackingCommon final {
+class ContentBlocking final {
  public:
-  // Normally we would include PContentParent.h here and use the
-  // ipc::FirstPartyStorageAccessGrantedForOriginResolver type which maps to
-  // the same underlying type, but that results in Windows compilation errors,
-  // so we use the underlying type to avoid the #include here.
-  typedef std::function<void(const bool&)>
-      FirstPartyStorageAccessGrantedForOriginResolver;
-
   // This method returns true if the URI has first party storage access when
   // loaded inside the passed 3rd party context tracking resource window.
   // If the window is first party context, please use
-  // MaybeIsFirstPartyStorageAccessGrantedFor();
+  // ApproximateAllowAccessForWithoutChannel();
   //
   // aRejectedReason could be set to one of these values if passed and if the
   // storage permission is not granted:
   //  * nsIWebProgressListener::STATE_COOKIES_BLOCKED_BY_PERMISSION
   //  * nsIWebProgressListener::STATE_COOKIES_BLOCKED_TRACKER
   //  * nsIWebProgressListener::STATE_COOKIES_BLOCKED_SOCIALTRACKER
   //  * nsIWebProgressListener::STATE_COOKIES_BLOCKED_ALL
   //  * nsIWebProgressListener::STATE_COOKIES_BLOCKED_FOREIGN
-  static bool IsFirstPartyStorageAccessGrantedFor(
-      nsPIDOMWindowInner* a3rdPartyTrackingWindow, nsIURI* aURI,
-      uint32_t* aRejectedReason);
+  static bool ShouldAllowAccessFor(nsPIDOMWindowInner* a3rdPartyTrackingWindow,
+                                   nsIURI* aURI, uint32_t* aRejectedReason);
 
-  // Note: you should use IsFirstPartyStorageAccessGrantedFor() passing the
-  // nsIChannel! Use this method _only_ if the channel is not available.
-  // For first party window, it's impossible to know if the aURI is a tracking
-  // resource synchronously, so here we return the best guest: if we are sure
-  // that the permission is granted for the origin of aURI, this method returns
-  // true, otherwise false.
-  static bool MaybeIsFirstPartyStorageAccessGrantedFor(
+  // Note: you should use ShouldAllowAccessFor() passing the nsIChannel! Use
+  // this method _only_ if the channel is not available.  For first party
+  // window, it's impossible to know if the aURI is a tracking resource
+  // synchronously, so here we return the best guest: if we are sure that the
+  // permission is granted for the origin of aURI, this method returns true,
+  // otherwise false.
+  static bool ApproximateAllowAccessForWithoutChannel(
       nsPIDOMWindowInner* aFirstPartyWindow, nsIURI* aURI);
 
   // It returns true if the URI has access to the first party storage.
   // aChannel can be a 3rd party channel, or not.
-  // See IsFirstPartyStorageAccessGrantedFor(window) to see the possible values
-  // of aRejectedReason.
-  static bool IsFirstPartyStorageAccessGrantedFor(nsIChannel* aChannel,
-                                                  nsIURI* aURI,
-                                                  uint32_t* aRejectedReason);
+  // See ShouldAllowAccessFor(window) to see the possible values of
+  // aRejectedReason.
+  static bool ShouldAllowAccessFor(nsIChannel* aChannel, nsIURI* aURI,
+                                   uint32_t* aRejectedReason);
 
   // This method checks if the principal has the permission to access to the
   // first party storage.
-  static bool IsFirstPartyStorageAccessGrantedFor(
-      nsIPrincipal* aPrincipal, nsICookieJarSettings* aCookieJarSettings);
+  static bool ShouldAllowAccessFor(nsIPrincipal* aPrincipal,
+                                   nsICookieJarSettings* aCookieJarSettings);
 
   enum StorageAccessPromptChoices { eAllow, eAllowAutoGrant };
 
   // Grant the permission for aOrigin to have access to the first party storage.
   // This method can handle 2 different scenarios:
   // - aParentWindow is a 3rd party context, it opens an aOrigin window and the
   //   user interacts with it. We want to grant the permission at the
   //   combination: top-level + aParentWindow + aOrigin.
@@ -88,26 +79,24 @@ class AntiTrackingCommon final {
   //   the first party stoage when loaded in aParentWindow.
   //   Ex: example.net import tracker.com/script.js which does opens a popup and
   //   the user interacts with it. tracker.com is allowed when loaded by
   //   example.net.
   typedef MozPromise<int, bool, true> StorageAccessFinalCheckPromise;
   typedef std::function<RefPtr<StorageAccessFinalCheckPromise>()>
       PerformFinalChecks;
   typedef MozPromise<int, bool, true> StorageAccessGrantPromise;
-  static MOZ_MUST_USE RefPtr<StorageAccessGrantPromise>
-  AddFirstPartyStorageAccessGrantedFor(
+  static MOZ_MUST_USE RefPtr<StorageAccessGrantPromise> AllowAccessFor(
       nsIPrincipal* aPrincipal, nsPIDOMWindowInner* aParentWindow,
       ContentBlockingNotifier::StorageAccessGrantedReason aReason,
       const PerformFinalChecks& aPerformFinalChecks = nullptr);
 
   // For IPC only.
-  typedef MozPromise<nsresult, bool, true> FirstPartyStorageAccessGrantPromise;
-  static RefPtr<FirstPartyStorageAccessGrantPromise>
-  SaveFirstPartyStorageAccessGrantedForOriginOnParentProcess(
+  typedef MozPromise<nsresult, bool, true> ParentAccessGrantPromise;
+  static RefPtr<ParentAccessGrantPromise> SaveAccessForOriginOnParentProcess(
       nsIPrincipal* aPrincipal, nsIPrincipal* aTrackingPrinciapl,
       const nsCString& aTrackingOrigin, int aAllowMode,
       uint64_t aExpirationTime =
           StaticPrefs::privacy_restrict3rdpartystorage_expiration());
 };
 
 }  // namespace mozilla
 
--- a/toolkit/components/antitracking/ContentBlockingAllowList.h
+++ b/toolkit/components/antitracking/ContentBlockingAllowList.h
@@ -38,18 +38,18 @@ class ContentBlockingAllowList final {
                                  const OriginAttributes& aAttrs,
                                  nsIPrincipal** aPrincipal);
 
  private:
   // Get the cache of allow list lookups for recent window/channels passed to
   // Check().
   static ContentBlockingAllowListCache& Cache();
 
-  // Utility APIs for AntiTrackingCommon.
+  // Utility APIs for ContentBlocking.
   static bool Check(nsIPrincipal* aTopWinPrincipal, bool aIsPrivateBrowsing);
   static bool Check(nsPIDOMWindowInner* aWindow);
 
-  friend class AntiTrackingCommon;
+  friend class ContentBlocking;
 };
 
 }  // namespace mozilla
 
 #endif  // mozilla_contentblockingallowlist_h
--- a/toolkit/components/antitracking/ContentBlockingNotifier.cpp
+++ b/toolkit/components/antitracking/ContentBlockingNotifier.cpp
@@ -1,17 +1,16 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* vim: set ts=8 sts=2 et sw=2 tw=80: */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "AntiTrackingLog.h"
 #include "ContentBlockingNotifier.h"
-#include "AntiTrackingCommon.h"
 #include "AntiTrackingUtils.h"
 
 #include "mozilla/AbstractEventQueue.h"
 #include "mozilla/StaticPrefs_privacy.h"
 #include "mozilla/dom/BrowserChild.h"
 #include "mozilla/dom/BrowsingContext.h"
 #include "mozilla/dom/WindowGlobalParent.h"
 #include "nsIClassifiedChannel.h"
--- a/toolkit/components/antitracking/ContentBlockingUserInteraction.cpp
+++ b/toolkit/components/antitracking/ContentBlockingUserInteraction.cpp
@@ -1,17 +1,16 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* vim: set ts=8 sts=2 et sw=2 tw=80: */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "AntiTrackingLog.h"
 #include "ContentBlockingUserInteraction.h"
-#include "AntiTrackingCommon.h"
 #include "AntiTrackingUtils.h"
 
 #include "mozilla/dom/ContentChild.h"
 #include "nsIPrincipal.h"
 #include "nsPermissionManager.h"
 #include "nsXULAppAPI.h"
 #include "prtime.h"
 
--- a/toolkit/components/antitracking/StorageAccess.cpp
+++ b/toolkit/components/antitracking/StorageAccess.cpp
@@ -1,17 +1,17 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* vim: set ts=8 sts=2 et sw=2 tw=80: */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "mozilla/dom/Document.h"
 #include "mozilla/net/CookieJarSettings.h"
-#include "mozilla/AntiTrackingCommon.h"
+#include "mozilla/ContentBlocking.h"
 #include "mozilla/StaticPrefs_browser.h"
 #include "mozilla/StaticPrefs_network.h"
 #include "mozilla/StaticPrefs_privacy.h"
 #include "mozilla/StorageAccess.h"
 #include "nsContentUtils.h"
 #include "nsICookiePermission.h"
 #include "nsICookieService.h"
 #include "nsICookieJarSettings.h"
@@ -170,35 +170,33 @@ static StorageAccess InternalStorageAllo
 static bool StorageDisabledByAntiTrackingInternal(
     nsPIDOMWindowInner* aWindow, nsIChannel* aChannel, nsIPrincipal* aPrincipal,
     nsIURI* aURI, nsICookieJarSettings* aCookieJarSettings,
     uint32_t& aRejectedReason) {
   MOZ_ASSERT(aWindow || aChannel || aPrincipal);
 
   if (aWindow) {
     nsIURI* documentURI = aURI ? aURI : aWindow->GetDocumentURI();
-    return !documentURI ||
-           !AntiTrackingCommon::IsFirstPartyStorageAccessGrantedFor(
-               aWindow, documentURI, &aRejectedReason);
+    return !documentURI || !ContentBlocking::ShouldAllowAccessFor(
+                               aWindow, documentURI, &aRejectedReason);
   }
 
   if (aChannel) {
     nsCOMPtr<nsIURI> uri;
     nsresult rv = aChannel->GetURI(getter_AddRefs(uri));
     if (NS_WARN_IF(NS_FAILED(rv))) {
       return false;
     }
 
-    return !AntiTrackingCommon::IsFirstPartyStorageAccessGrantedFor(
-        aChannel, uri, &aRejectedReason);
+    return !ContentBlocking::ShouldAllowAccessFor(aChannel, uri,
+                                                  &aRejectedReason);
   }
 
   MOZ_ASSERT(aPrincipal);
-  return !AntiTrackingCommon::IsFirstPartyStorageAccessGrantedFor(
-      aPrincipal, aCookieJarSettings);
+  return !ContentBlocking::ShouldAllowAccessFor(aPrincipal, aCookieJarSettings);
 }
 
 namespace mozilla {
 
 StorageAccess StorageAllowedForWindow(nsPIDOMWindowInner* aWindow,
                                       uint32_t* aRejectedReason) {
   uint32_t rejectedReason;
   if (!aRejectedReason) {
--- a/toolkit/components/antitracking/StoragePrincipalHelper.cpp
+++ b/toolkit/components/antitracking/StoragePrincipalHelper.cpp
@@ -2,17 +2,17 @@
 /* vim: set ts=8 sts=2 et sw=2 tw=80: */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "StoragePrincipalHelper.h"
 
 #include "mozilla/ipc/PBackgroundSharedTypes.h"
-#include "mozilla/AntiTrackingCommon.h"
+#include "mozilla/ContentBlocking.h"
 #include "mozilla/ScopeExit.h"
 #include "mozilla/StorageAccess.h"
 #include "nsContentUtils.h"
 
 namespace mozilla {
 
 namespace {
 
@@ -27,23 +27,22 @@ bool ChooseOriginAttributes(nsIChannel* 
 
   nsCOMPtr<nsIURI> uri;
   nsresult rv = aChannel->GetURI(getter_AddRefs(uri));
   if (NS_FAILED(rv)) {
     return false;
   }
 
   uint32_t rejectedReason = 0;
-  if (AntiTrackingCommon::IsFirstPartyStorageAccessGrantedFor(
-          aChannel, uri, &rejectedReason)) {
+  if (ContentBlocking::ShouldAllowAccessFor(aChannel, uri, &rejectedReason)) {
     return false;
   }
 
   // Let's use the storage principal only if we need to partition the cookie
-  // jar.  We use the lower-level AntiTrackingCommon API here to ensure this
+  // jar.  We use the lower-level ContentBlocking API here to ensure this
   // check doesn't send notifications.
   if (!ShouldPartitionStorage(rejectedReason) ||
       !StoragePartitioningEnabled(rejectedReason, cjs)) {
     return false;
   }
 
   nsCOMPtr<nsIPrincipal> toplevelPrincipal = loadInfo->GetTopLevelPrincipal();
   if (!toplevelPrincipal) {
--- a/toolkit/components/antitracking/TemporaryAccessGrantObserver.cpp
+++ b/toolkit/components/antitracking/TemporaryAccessGrantObserver.cpp
@@ -1,20 +1,20 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* vim: set ts=8 sts=2 et sw=2 tw=80: */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "TemporaryAccessGrantObserver.h"
-#include "AntiTrackingCommon.h"
 
 #include "nsIObserverService.h"
 #include "nsPermissionManager.h"
 #include "nsTHashtable.h"
+#include "nsXULAppAPI.h"
 
 using namespace mozilla;
 
 UniquePtr<TemporaryAccessGrantObserver::ObserversTable>
     TemporaryAccessGrantObserver::sObservers;
 
 TemporaryAccessGrantObserver::TemporaryAccessGrantObserver(
     nsPermissionManager* aPM, nsIPrincipal* aPrincipal, const nsACString& aType)
--- a/toolkit/components/antitracking/moz.build
+++ b/toolkit/components/antitracking/moz.build
@@ -26,32 +26,32 @@ EXTRA_JS_MODULES += [
     'URLDecorationAnnotationsService.jsm',
 ]
 
 XPCOM_MANIFESTS += [
     'components.conf',
 ]
 
 EXPORTS.mozilla = [
-    'AntiTrackingCommon.h',
     'AntiTrackingIPCUtils.h',
     'AntiTrackingRedirectHeuristic.h',
     'AntiTrackingUtils.h',
+    'ContentBlocking.h',
     'ContentBlockingAllowList.h',
     'ContentBlockingNotifier.h',
     'ContentBlockingUserInteraction.h',
     'StorageAccess.h',
     'StoragePrincipalHelper.h',
     'URLDecorationStripper.h',
 ]
 
 UNIFIED_SOURCES += [
-    'AntiTrackingCommon.cpp',
     'AntiTrackingRedirectHeuristic.cpp',
     'AntiTrackingUtils.cpp',
+    'ContentBlocking.cpp',
     'ContentBlockingAllowList.cpp',
     'ContentBlockingNotifier.cpp',
     'ContentBlockingUserInteraction.cpp',
     'SettingsChangeObserver.cpp',
     'StorageAccess.cpp',
     'StoragePrincipalHelper.cpp',
     'TemporaryAccessGrantObserver.cpp',
     'URLDecorationStripper.cpp',