Remove ENABLE_CONTENT_FILTERING_IN_NETWORKING_PROCESS

https://bugs.webkit.org/show_bug.cgi?id=259737 rdar://113275381 Reviewed by Andy Estes. It is true everywhere it is meaningful, which is where ENABLE(CONTENT_FILTERING) is true. For a few years after its introduction, we were still supporting macOS versions where it was unavailable, but now that is not needed. Both are still off on tvOS, and this removes a few Network Extension items from the sandbox that were only used for content filtering, so it should be no change in behavior. Just simplifying the code and removing unneeded code. * Source/WTF/wtf/PlatformEnableCocoa.h: * Source/WebCore/loader/ContentFilter.cpp: (WebCore::ContentFilter::startFilteringMainResource): (WebCore::ContentFilter::stopFilteringMainResource): (WebCore::ContentFilter::continueAfterDataReceived): (WebCore::ContentFilter::continueAfterNotifyFinished): (WebCore::ContentFilter::url): (WebCore::ContentFilter::deliverStoredResourceData): * Source/WebCore/loader/ContentFilter.h: * Source/WebCore/loader/DocumentLoader.cpp: (WebCore::DocumentLoader::startLoadingMainResource): (WebCore::DocumentLoader::handleContentFilterDidBlock): (WebCore::DocumentLoader::contentFilterWillHandleProvisionalLoadFailure): (WebCore::DocumentLoader::contentFilterHandleProvisionalLoadFailure): * Source/WebCore/loader/DocumentLoader.h: (WebCore::DocumentLoader::setSubstituteDataFromContentFilter): * Source/WebCore/platform/ContentFilterUnblockHandler.h: (WebCore::ContentFilterUnblockHandler::unblockedAfterRequest const): * Source/WebCore/platform/cocoa/ContentFilterUnblockHandlerCocoa.mm: (WebCore::ContentFilterUnblockHandler::ContentFilterUnblockHandler): (WebCore::ContentFilterUnblockHandler::canHandleRequest const): (WebCore::ContentFilterUnblockHandler::requestUnblockAsync const): (WebCore::ContentFilterUnblockHandler::setUnblockedAfterRequest): * Source/WebCore/platform/cocoa/NetworkExtensionContentFilter.h: * Source/WebCore/platform/cocoa/NetworkExtensionContentFilter.mm: (WebCore::NetworkExtensionContentFilter::enabled): (WebCore::NetworkExtensionContentFilter::setHasConsumedSandboxExtensions): Deleted. * Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp: * Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.h: * Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.messages.in: * Source/WebKit/NetworkProcess/NetworkResourceLoader.cpp: (WebKit::NetworkResourceLoader::didReceiveResponse): (WebKit::NetworkResourceLoader::didFinishLoading): (WebKit::NetworkResourceLoader::willSendRedirectedRequestInternal): (WebKit::NetworkResourceLoader::bufferingTimerFired): (WebKit::NetworkResourceLoader::sendBuffer): (WebKit::NetworkResourceLoader::didRetrieveCacheEntry): (WebKit::NetworkResourceLoader::sendResultForCacheEntry): (WebKit::NetworkResourceLoader::startWithServiceWorker): * Source/WebKit/NetworkProcess/NetworkResourceLoader.h: * Source/WebKit/NetworkProcess/ServiceWorker/ServiceWorkerFetchTask.cpp: (WebKit::ServiceWorkerFetchTask::processResponse): (WebKit::ServiceWorkerFetchTask::didReceiveData): (WebKit::ServiceWorkerFetchTask::didReceiveDataFromPreloader): (WebKit::ServiceWorkerFetchTask::didFinish): * Source/WebKit/NetworkProcess/cocoa/NetworkProcessCocoa.mm: (WebKit::NetworkProcess::platformInitializeNetworkProcessCocoa): * Source/WebKit/Resources/SandboxProfiles/ios/com.apple.WebKit.Networking.sb.in: * Source/WebKit/Resources/SandboxProfiles/ios/com.apple.WebKit.WebContent.sb.in: * Source/WebKit/Shared/Cocoa/LoadParametersCocoa.mm: (WebKit::LoadParameters::platformEncode const): (WebKit::LoadParameters::platformDecode): * Source/WebKit/Shared/Cocoa/WebCoreArgumentCodersCocoa.serialization.in: * Source/WebKit/Shared/LoadParameters.h: * Source/WebKit/Shared/WebCoreArgumentCoders.h: * Source/WebKit/Shared/WebCoreArgumentCoders.serialization.in: * Source/WebKit/UIProcess/Cocoa/WebPageProxyCocoa.mm: (WebKit::WebPageProxy::addPlatformLoadParameters): (WebKit::WebPageProxy::createNetworkExtensionsSandboxExtensions): Deleted. * Source/WebKit/UIProcess/WebPageProxy.cpp: (WebKit::WebPageProxy::decidePolicyForNavigationActionAsyncShared): (WebKit::WebPageProxy::decidePolicyForNewWindowAction): (WebKit::WebPageProxy::decidePolicyForResponseShared): (WebKit::WebPageProxy::createNetworkExtensionsSandboxExtensions): Deleted. * Source/WebKit/UIProcess/WebPageProxy.h: * Source/WebKit/UIProcess/WebProcessProxy.h: (WebKit::WebProcessProxy::hasManagedSessionSandboxAccess const): Deleted. (WebKit::WebProcessProxy::markHasManagedSessionSandboxAccess): Deleted. * Source/WebKit/WebProcess/Network/WebMockContentFilterManager.cpp: * Source/WebKit/WebProcess/Network/WebResourceLoader.cpp: * Source/WebKit/WebProcess/Network/WebResourceLoader.h: * Source/WebKit/WebProcess/Network/WebResourceLoader.messages.in: * Source/WebKit/WebProcess/WebPage/Cocoa/WebPageCocoa.mm: (WebKit::WebPage::platformDidReceiveLoadParameters): (WebKit::WebPage::consumeNetworkExtensionSandboxExtensions): Deleted. * Source/WebKit/WebProcess/WebPage/WebPage.cpp: (WebKit::WebPage::didReceivePolicyDecision): (WebKit::WebPage::consumeNetworkExtensionSandboxExtensions): Deleted. * Source/WebKit/WebProcess/WebPage/WebPage.h: * Source/WebKit/WebProcess/WebPage/WebPage.messages.in: * Source/WebKit/WebProcess/WebProcess.cpp: * Source/WebKit/WebProcess/com.apple.WebProcess.sb.in: * Tools/TestWebKitAPI/Tests/WebKitCocoa/ContentFiltering.mm: (TEST): Canonical link: https://commits.webkit.org/266523@main
WebKit · Aug 2, 2023 · 6b6c142 · 6b6c142
1 parent 818a686
commit 6b6c142
Show file tree

Hide file tree

Showing 38 changed files with 42 additions and 331 deletions.
diff --git a/Source/WTF/wtf/PlatformEnableCocoa.h b/Source/WTF/wtf/PlatformEnableCocoa.h
@@ -215,10 +215,6 @@
 #define ENABLE_CONTENT_FILTERING 1
 #endif
 
-#if defined(ENABLE_CONTENT_FILTERING) && ENABLE_CONTENT_FILTERING
-#define ENABLE_CONTENT_FILTERING_IN_NETWORKING_PROCESS 1
-#endif
-
 #if !defined(ENABLE_CONTEXT_MENUS) && PLATFORM(IOS_FAMILY)
 #define ENABLE_CONTEXT_MENUS 0
 #endif

diff --git a/Source/WebCore/loader/ContentFilter.cpp b/Source/WebCore/loader/ContentFilter.cpp
@@ -111,7 +111,6 @@ bool ContentFilter::continueAfterWillSendRequest(ResourceRequest& request, const
     return !request.isNull();
 }
 
-#if ENABLE(CONTENT_FILTERING_IN_NETWORKING_PROCESS)
 void ContentFilter::startFilteringMainResource(const URL& url)
 {
     if (m_state != State::Stopped)
@@ -122,7 +121,6 @@ void ContentFilter::startFilteringMainResource(const URL& url)
     ASSERT(m_mainResourceURL.isEmpty());
     m_mainResourceURL = url;
 }
-#endif
 
 void ContentFilter::startFilteringMainResource(CachedRawResource& resource)
 {
@@ -139,11 +137,7 @@ void ContentFilter::stopFilteringMainResource()
 {
     if (m_state != State::Blocked)
         m_state = State::Stopped;
-#if ENABLE(CONTENT_FILTERING_IN_NETWORKING_PROCESS)
     m_mainResourceURL = URL();
-#else
-    m_mainResource = nullptr;
-#endif
 }
 
 bool ContentFilter::continueAfterResponseReceived(const ResourceResponse& response)
@@ -162,7 +156,6 @@ bool ContentFilter::continueAfterResponseReceived(const ResourceResponse& respon
     return m_state != State::Blocked;
 }
 
-#if ENABLE(CONTENT_FILTERING_IN_NETWORKING_PROCESS)
 bool ContentFilter::continueAfterDataReceived(const SharedBuffer& data, size_t encodedDataLength)
 {
     Ref<ContentFilterClient> protectedClient { m_client };
@@ -183,7 +176,6 @@ bool ContentFilter::continueAfterDataReceived(const SharedBuffer& data, size_t e
 
     return m_state != State::Blocked;
 }
-#endif
 
 bool ContentFilter::continueAfterDataReceived(const SharedBuffer& data)
 {
@@ -206,7 +198,6 @@ bool ContentFilter::continueAfterDataReceived(const SharedBuffer& data)
     return m_state != State::Blocked;
 }
 
-#if ENABLE(CONTENT_FILTERING_IN_NETWORKING_PROCESS)
 bool ContentFilter::continueAfterNotifyFinished(const URL& resourceURL)
 {
     Ref<ContentFilterClient> protectedClient { m_client };
@@ -229,7 +220,6 @@ bool ContentFilter::continueAfterNotifyFinished(const URL& resourceURL)
 
     return m_state != State::Blocked;
 }
-#endif
 
 bool ContentFilter::continueAfterNotifyFinished(CachedResource& resource)
 {
@@ -310,11 +300,7 @@ URL ContentFilter::url()
 {
     if (m_mainResource)
         return m_mainResource->url();
-#if ENABLE(CONTENT_FILTERING_IN_NETWORKING_PROCESS)
     return m_mainResourceURL;
-#else
-    return URL();
-#endif
 }
 
 const URL& ContentFilter::blockedPageURL()
@@ -364,14 +350,12 @@ void ContentFilter::handleProvisionalLoadFailure(const ResourceError& error)
     m_client.handleProvisionalLoadFailureFromContentFilter(blockedPageURL(), substituteData);
 }
 
-#if ENABLE(CONTENT_FILTERING_IN_NETWORKING_PROCESS)
 void ContentFilter::deliverStoredResourceData()
 {
     for (auto& buffer : m_buffers)
         deliverResourceData(*buffer.buffer, buffer.encodedDataLength);
     m_buffers.clear();
 }
-#endif
 
 } // namespace WebCore
 

diff --git a/Source/WebCore/loader/ContentFilter.h b/Source/WebCore/loader/ContentFilter.h
@@ -55,18 +55,14 @@ class ContentFilter {
 
     static constexpr ASCIILiteral urlScheme() { return "x-apple-content-filter"_s; }
 
-#if ENABLE(CONTENT_FILTERING_IN_NETWORKING_PROCESS)
     WEBCORE_EXPORT void startFilteringMainResource(const URL&);
-#endif
     void startFilteringMainResource(CachedRawResource&);
     WEBCORE_EXPORT void stopFilteringMainResource();
 
     WEBCORE_EXPORT bool continueAfterWillSendRequest(ResourceRequest&, const ResourceResponse&);
     WEBCORE_EXPORT bool continueAfterResponseReceived(const ResourceResponse&);
-#if ENABLE(CONTENT_FILTERING_IN_NETWORKING_PROCESS)
     WEBCORE_EXPORT bool continueAfterDataReceived(const SharedBuffer&, size_t encodedDataLength);
     WEBCORE_EXPORT bool continueAfterNotifyFinished(const URL& resourceURL);
-#endif
     bool continueAfterDataReceived(const SharedBuffer&);
     bool continueAfterNotifyFinished(CachedResource&);
 
@@ -97,23 +93,18 @@ class ContentFilter {
     template <typename Function> void forEachContentFilterUntilBlocked(Function&&);
     void didDecide(State);
     void deliverResourceData(const SharedBuffer&, size_t encodedDataLength = 0);
-#if ENABLE(CONTENT_FILTERING_IN_NETWORKING_PROCESS)
     void deliverStoredResourceData();
-#endif
 
     URL url();
 
     Container m_contentFilters;
     ContentFilterClient& m_client;
-#if ENABLE(CONTENT_FILTERING_IN_NETWORKING_PROCESS)
     URL m_mainResourceURL;
     struct ResourceDataItem {
         RefPtr<const SharedBuffer> buffer;
         size_t encodedDataLength;
     };
-
     Vector<ResourceDataItem> m_buffers;
-#endif
     CachedResourceHandle<CachedRawResource> m_mainResource;
     const PlatformContentFilter* m_blockingContentFilter { nullptr };
     State m_state { State::Stopped };

diff --git a/Source/WebCore/loader/DocumentLoader.cpp b/Source/WebCore/loader/DocumentLoader.cpp
@@ -2096,11 +2096,8 @@ void DocumentLoader::startLoadingMainResource()
     }
 
 #if ENABLE(CONTENT_FILTERING)
-    contentFilterInDocumentLoader() = true;
-#if ENABLE(CONTENT_FILTERING_IN_NETWORKING_PROCESS)
     // Always filter in WK1
     contentFilterInDocumentLoader() = m_frame && m_frame->view() && m_frame->view()->platformWidget();
-#endif
     if (contentFilterInDocumentLoader())
         m_contentFilter = !m_substituteData.isValid() ? ContentFilter::create(*this) : nullptr;
 #endif
@@ -2533,10 +2530,8 @@ ResourceError DocumentLoader::handleContentFilterDidBlock(ContentFilterUnblockHa
     frameLoader()->client().contentFilterDidBlockLoad(WTFMove(unblockHandler));
     auto error = frameLoader()->blockedByContentFilterError(request());
 
-#if ENABLE(CONTENT_FILTERING_IN_NETWORKING_PROCESS)
     m_blockedByContentFilter = true;
     m_blockedError = error;
-#endif
 
     return error;
 }
@@ -2547,11 +2542,7 @@ bool DocumentLoader::contentFilterWillHandleProvisionalLoadFailure(const Resourc
         return true;
     if (contentFilterInDocumentLoader())
         return false;
-#if ENABLE(CONTENT_FILTERING_IN_NETWORKING_PROCESS)
     return m_blockedByContentFilter && m_blockedError.errorCode() == error.errorCode() && m_blockedError.domain() == error.domain();
-#else
-    return false;
-#endif
 }
 
 void DocumentLoader::contentFilterHandleProvisionalLoadFailure(const ResourceError& error)
@@ -2560,9 +2551,7 @@ void DocumentLoader::contentFilterHandleProvisionalLoadFailure(const ResourceErr
         m_contentFilter->handleProvisionalLoadFailure(error);
     if (contentFilterInDocumentLoader())
         return;
-#if ENABLE(CONTENT_FILTERING_IN_NETWORKING_PROCESS)
     handleProvisionalLoadFailureFromContentFilter(m_blockedPageURL, m_substituteDataFromContentFilter);
-#endif
 }
 
 #endif // ENABLE(CONTENT_FILTERING)

diff --git a/Source/WebCore/loader/DocumentLoader.h b/Source/WebCore/loader/DocumentLoader.h
@@ -418,10 +418,8 @@ class DocumentLoader
     WEBCORE_EXPORT void setRedirectionAsSubstituteData(ResourceResponse&&);
 
 #if ENABLE(CONTENT_FILTERING)
-#if ENABLE(CONTENT_FILTERING_IN_NETWORKING_PROCESS)
     void setBlockedPageURL(const URL& blockedPageURL) { m_blockedPageURL = blockedPageURL; }
     void setSubstituteDataFromContentFilter(SubstituteData&& substituteDataFromContentFilter) { m_substituteDataFromContentFilter = WTFMove(substituteDataFromContentFilter); }
-#endif // ENABLE(CONTENT_FILTERING_IN_NETWORKING_PROCESS)
     ContentFilter* contentFilter() const { return m_contentFilter.get(); }
     void ref() const final { RefCounted<DocumentLoader>::ref(); }
     void deref() const final { RefCounted<DocumentLoader>::deref(); }
@@ -669,11 +667,9 @@ class DocumentLoader
 
 #if ENABLE(CONTENT_FILTERING)
     std::unique_ptr<ContentFilter> m_contentFilter;
-#if ENABLE(CONTENT_FILTERING_IN_NETWORKING_PROCESS)
     ResourceError m_blockedError;
     URL m_blockedPageURL;
     SubstituteData m_substituteDataFromContentFilter;
-#endif // ENABLE(CONTENT_FILTERING_IN_NETWORKING_PROCESS)
 #endif // ENABLE(CONTENT_FILTERING)
 
 #if USE(QUICK_LOOK)
@@ -746,9 +742,9 @@ class DocumentLoader
     bool m_finishedLoadingApplicationManifest { false };
 #endif
 
-#if ENABLE(CONTENT_FILTERING) && ENABLE(CONTENT_FILTERING_IN_NETWORKING_PROCESS)
+#if ENABLE(CONTENT_FILTERING)
     bool m_blockedByContentFilter { false };
-#endif // ENABLE(CONTENT_FILTERING) && ENABLE(CONTENT_FILTERING_IN_NETWORKING_PROCESS)
+#endif
 
 #if ENABLE(SERVICE_WORKER)
     bool m_canUseServiceWorkers { true };

diff --git a/Source/WebCore/platform/ContentFilterUnblockHandler.h b/Source/WebCore/platform/ContentFilterUnblockHandler.h
@@ -60,9 +60,7 @@ class ContentFilterUnblockHandler {
 #if HAVE(PARENTAL_CONTROLS_WITH_UNBLOCK_HANDLER)
         Vector<uint8_t>&& webFilterEvaluatorData,
 #endif
-#if ENABLE(CONTENT_FILTERING_IN_NETWORKING_PROCESS)
         bool unblockedAfterRequest
-#endif
     );
 
     WEBCORE_EXPORT bool needsUIProcess() const;
@@ -78,10 +76,8 @@ class ContentFilterUnblockHandler {
     WEBCORE_EXPORT Vector<uint8_t> webFilterEvaluatorData() const;
 #endif
 
-#if ENABLE(CONTENT_FILTERING_IN_NETWORKING_PROCESS)
     WEBCORE_EXPORT void setUnblockedAfterRequest(bool);
     bool unblockedAfterRequest() const { return m_unblockedAfterRequest; }
-#endif
 
 private:
 #if HAVE(PARENTAL_CONTROLS_WITH_UNBLOCK_HANDLER)
@@ -94,9 +90,7 @@ class ContentFilterUnblockHandler {
 #if HAVE(PARENTAL_CONTROLS_WITH_UNBLOCK_HANDLER)
     RetainPtr<WebFilterEvaluator> m_webFilterEvaluator;
 #endif
-#if ENABLE(CONTENT_FILTERING_IN_NETWORKING_PROCESS)
     bool m_unblockedAfterRequest { false };
-#endif
 };
 
 } // namespace WebCore

diff --git a/Source/WebCore/platform/cocoa/ContentFilterUnblockHandlerCocoa.mm b/Source/WebCore/platform/cocoa/ContentFilterUnblockHandlerCocoa.mm
@@ -70,17 +70,13 @@
 #if HAVE(PARENTAL_CONTROLS_WITH_UNBLOCK_HANDLER)
     Vector<uint8_t>&& webFilterEvaluatorData,
 #endif
-#if ENABLE(CONTENT_FILTERING_IN_NETWORKING_PROCESS)
     bool unblockedAfterRequest
-#endif
     ) : m_unblockURLHost(WTFMove(unblockURLHost))
     , m_unreachableURL(WTFMove(unreachableURL))
 #if HAVE(PARENTAL_CONTROLS_WITH_UNBLOCK_HANDLER)
     , m_webFilterEvaluator(unpackWebFilterEvaluatorData(WTFMove(webFilterEvaluatorData)))
 #endif
-#if ENABLE(CONTENT_FILTERING_IN_NETWORKING_PROCESS)
     , m_unblockedAfterRequest(unblockedAfterRequest)
-#endif
 {
 }
 
@@ -128,11 +124,7 @@
 
 bool ContentFilterUnblockHandler::canHandleRequest(const ResourceRequest& request) const
 {
-    if (!m_unblockRequester
-#if ENABLE(CONTENT_FILTERING_IN_NETWORKING_PROCESS)
-        && !m_unblockedAfterRequest
-#endif
-        ) {
+    if (!m_unblockRequester && !m_unblockedAfterRequest) {
 #if HAVE(PARENTAL_CONTROLS_WITH_UNBLOCK_HANDLER)
         if (!m_webFilterEvaluator)
             return false;
@@ -163,13 +155,11 @@
     }
 #endif
     auto unblockRequester = m_unblockRequester;
-#if ENABLE(CONTENT_FILTERING_IN_NETWORKING_PROCESS)
     if (!unblockRequester && m_unblockedAfterRequest) {
         unblockRequester = [unblocked = m_unblockedAfterRequest](ContentFilterUnblockHandler::DecisionHandlerFunction function) {
             function(unblocked);
         };
     }
-#endif
     if (unblockRequester) {
         unblockRequester([decisionHandler](bool unblocked) {
             callOnMainThread([decisionHandler, unblocked] {
@@ -184,12 +174,10 @@
     }
 }
 
-#if ENABLE(CONTENT_FILTERING_IN_NETWORKING_PROCESS)
 void ContentFilterUnblockHandler::setUnblockedAfterRequest(bool unblocked)
 {
     m_unblockedAfterRequest = unblocked;
 }
-#endif
 
 } // namespace WebCore
 

diff --git a/Source/WebCore/platform/cocoa/NetworkExtensionContentFilter.h b/Source/WebCore/platform/cocoa/NetworkExtensionContentFilter.h
@@ -55,9 +55,6 @@ class NetworkExtensionContentFilter final : public PlatformContentFilter {
     ContentFilterUnblockHandler unblockHandler() const override;
 
     WEBCORE_EXPORT static bool isRequired();
-#if !ENABLE(CONTENT_FILTERING_IN_NETWORKING_PROCESS)
-    WEBCORE_EXPORT static void setHasConsumedSandboxExtensions(bool);
-#endif
 
 private:
     static bool enabled();
@@ -66,16 +63,6 @@ class NetworkExtensionContentFilter final : public PlatformContentFilter {
     void initialize(const URL* = nullptr);
     void handleDecision(NEFilterSourceStatus, NSData *replacementData);
 
-#if !ENABLE(CONTENT_FILTERING_IN_NETWORKING_PROCESS)
-    enum class SandboxExtensionsState : uint8_t {
-        Consumed,
-        NotConsumed,
-        NotSet
-    };
-
-    WEBCORE_EXPORT static SandboxExtensionsState m_sandboxExtensionsState;
-#endif
-
     OSObjectPtr<dispatch_queue_t> m_queue;
     RetainPtr<NSData> m_replacementData;
     RetainPtr<NEFilterSource> m_neFilterSource;

diff --git a/Source/WebCore/platform/cocoa/NetworkExtensionContentFilter.mm b/Source/WebCore/platform/cocoa/NetworkExtensionContentFilter.mm
@@ -48,30 +48,9 @@
 
 namespace WebCore {
 
-#if !ENABLE(CONTENT_FILTERING_IN_NETWORKING_PROCESS)
-NetworkExtensionContentFilter::SandboxExtensionsState NetworkExtensionContentFilter::m_sandboxExtensionsState = SandboxExtensionsState::NotSet;
-#endif
-
 bool NetworkExtensionContentFilter::enabled()
 {
-#if ENABLE(CONTENT_FILTERING_IN_NETWORKING_PROCESS)
     return isRequired();
-#else
-    bool enabled = false;
-    switch (m_sandboxExtensionsState) {
-    case SandboxExtensionsState::Consumed:
-        enabled = true;
-        break;
-    case SandboxExtensionsState::NotConsumed:
-        enabled = false;
-        break;
-    case SandboxExtensionsState::NotSet:
-        enabled = isRequired();
-        break;
-    }
-    LOG(ContentFiltering, "NetworkExtensionContentFilter is %s.\n", enabled ? "enabled" : "not enabled");
-    return enabled;
-#endif
 }
 
 UniqueRef<NetworkExtensionContentFilter> NetworkExtensionContentFilter::create()
@@ -234,16 +213,6 @@
     return [NEFilterSource filterRequired];
 }
 
-#if !ENABLE(CONTENT_FILTERING_IN_NETWORKING_PROCESS)
-void NetworkExtensionContentFilter::setHasConsumedSandboxExtensions(bool hasConsumedSandboxExtensions)
-{
-    if (m_sandboxExtensionsState == SandboxExtensionsState::Consumed)
-        return;
-
-    m_sandboxExtensionsState = (hasConsumedSandboxExtensions ? SandboxExtensionsState::Consumed : SandboxExtensionsState::NotConsumed);
-}
-#endif
-
 } // namespace WebCore
 
 #endif // ENABLE(CONTENT_FILTERING)
diff --git a/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp b/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp
@@ -1467,7 +1467,7 @@ RefPtr<NetworkResourceLoader> NetworkConnectionToWebProcess::takeNetworkResource
     return m_networkResourceLoaders.take(resourceLoadIdentifier);
 }
 
-#if ENABLE(CONTENT_FILTERING_IN_NETWORKING_PROCESS)
+#if ENABLE(CONTENT_FILTERING)
 void NetworkConnectionToWebProcess::installMockContentFilter(WebCore::MockContentFilterSettings&& settings)
 {
     MockContentFilterSettings::singleton() = WTFMove(settings);