Remove InjectedBundlePagePolicyClient

https://bugs.webkit.org/show_bug.cgi?id=247169
rdar://101655797

Reviewed by Tim Horton.

There was one layout test, fast/loader/policy-delegate-action-hit-test-zoomed.html,
which printed the dom node path of the clicked link.  This functionality is not available
nor needed in WK2.  The WK1 test still verifies it.  WK2 has _WKHitTestResult with tests
to verify we get the node info we need in this case.

* Source/WebKit/Sources.txt:
* Source/WebKit/WebKit.xcodeproj/project.pbxproj:
* Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundlePage.cpp:
(WKBundlePageSetPolicyClient):
* Source/WebKit/WebProcess/InjectedBundle/InjectedBundlePagePolicyClient.cpp: Removed.
* Source/WebKit/WebProcess/InjectedBundle/InjectedBundlePagePolicyClient.h: Removed.
* Source/WebKit/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
(WebKit::WebFrameLoaderClient::dispatchDecidePolicyForResponse):
(WebKit::WebFrameLoaderClient::dispatchDecidePolicyForNewWindowAction):
(WebKit::WebFrameLoaderClient::dispatchDecidePolicyForNavigationAction):
(WebKit::WebFrameLoaderClient::dispatchUnableToImplementPolicy):
* Source/WebKit/WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::close):
(WebKit::WebPage::initializeInjectedBundlePolicyClient): Deleted.
* Source/WebKit/WebProcess/WebPage/WebPage.h:
(WebKit::WebPage::injectedBundleLoaderClient):
(WebKit::WebPage::injectedBundlePolicyClient): Deleted.

Canonical link: https://commits.webkit.org/256491@main

LayoutTests/fast/encoding/mailto-always-utf-8-expected.txt

@@ -1,4 +1,4 @@
-Policy delegate: attempt to load mailto:?subject=%E3%82%BF%E3%82%A4%E3%83%88%E3%83%AB&body=%E6%9C%AC%E6%96%87 with navigation type 'link clicked' originating from #text > SPAN > A > BODY > HTML > #document
+Policy delegate: attempt to load mailto:?subject=%E3%82%BF%E3%82%A4%E3%83%88%E3%83%AB&body=%E6%9C%AC%E6%96%87 with navigation type 'link clicked'
 Test encoding of mailto URLs. Click on the URL - a new message with Japanese subject and body should open in your mail client.
 
 Subject : Japanese Body : Japanese

LayoutTests/fast/forms/mailto/formenctype-attribute-button-html-expected.txt

@@ -1,2 +1,2 @@
-Policy delegate: attempt to load mailto:?body=to%3Done%40example.org%0D%0Abody%3DLine%201%0D%0ALine%202%0D%0A%40%0D%0A%3D%2C%3B%3F%22%20%0D%0A with navigation type 'form submitted' originating from HTML > #document
+Policy delegate: attempt to load mailto:?body=to%3Done%40example.org%0D%0Abody%3DLine%201%0D%0ALine%202%0D%0A%40%0D%0A%3D%2C%3B%3F%22%20%0D%0A with navigation type 'form submitted'
 Field 1:  Field 2:

LayoutTests/fast/forms/mailto/formenctype-attribute-input-2-expected.txt

@@ -1,2 +1,2 @@
-Policy delegate: attempt to load mailto:?body=to%3Done%40example.org%0D%0Abody%3DLine%201%0D%0ALine%202%0D%0A%40%0D%0A%3D%2C%3B%3F%20%0D%0A with navigation type 'form submitted' originating from INPUT > FORM > BODY > HTML > #document
+Policy delegate: attempt to load mailto:?body=to%3Done%40example.org%0D%0Abody%3DLine%201%0D%0ALine%202%0D%0A%40%0D%0A%3D%2C%3B%3F%20%0D%0A with navigation type 'form submitted'
 Field 1:  Field 2:

LayoutTests/fast/forms/mailto/formenctype-attribute-input-html-expected.txt

@@ -1,2 +1,2 @@
-Policy delegate: attempt to load mailto:?body=to%3Done%40example.org%0D%0Abody%3DLine%201%0D%0ALine%202%0D%0A%40%0D%0A%3D%2C%3B%3F%22%20%0D%0A with navigation type 'form submitted' originating from HTML > #document
+Policy delegate: attempt to load mailto:?body=to%3Done%40example.org%0D%0Abody%3DLine%201%0D%0ALine%202%0D%0A%40%0D%0A%3D%2C%3B%3F%22%20%0D%0A with navigation type 'form submitted'
 Field 1:  Field 2:

LayoutTests/fast/loader/onload-policy-ignore-for-frame-async-delegates.html

@@ -6,6 +6,7 @@
         if (window.testRunner) {
             testRunner.dumpAsText();
             testRunner.setCustomPolicyDelegate(true);
+            if (testRunner.skipPolicyDelegateNotifyDone) { testRunner.skipPolicyDelegateNotifyDone() }
             if (testRunner.setShouldDecideNavigationPolicyAfterDelay)
                 testRunner.setShouldDecideNavigationPolicyAfterDelay(true);
         }
@@ -17,6 +18,7 @@
                 return;
             }
             result.innerText = "PASSED";
+            if (window.testRunner) { testRunner.notifyDone() }
         };
     </script>
 </head>

LayoutTests/fast/loader/onload-policy-ignore-for-frame.html

@@ -6,6 +6,7 @@
         if (window.testRunner) {
             testRunner.dumpAsText();
             testRunner.setCustomPolicyDelegate(true);
+            if (testRunner.skipPolicyDelegateNotifyDone) { testRunner.skipPolicyDelegateNotifyDone() }
         }
 
         window.onload = function() {
@@ -15,6 +16,7 @@
                 return;
             }
             result.innerText = "PASSED";
+            if (window.testRunner) { testRunner.notifyDone() }
         };
     </script>
 </head>

LayoutTests/fast/loader/policy-delegate-action-hit-test-zoomed-expected.txt

@@ -1,4 +1,4 @@
-Policy delegate: attempt to load about:blank with navigation type 'link clicked' originating from #text > A > BODY > HTML > #document
+Policy delegate: attempt to load about:blank with navigation type 'link clicked'
 This is a test for rdar://problem/6755137 Action dictionary for policy decision is missing keys when full-page zoom is used.
 
 Link

LayoutTests/http/tests/download/basic-ascii.html

@@ -3,7 +3,9 @@
 if (window.testRunner) {
     testRunner.dumpAsText();
     testRunner.setCustomPolicyDelegate(true, true);
+    if (testRunner.skipPolicyDelegateNotifyDone) { testRunner.skipPolicyDelegateNotifyDone() }
 }
+onload = () => { if (window.testRunner) { testRunner.notifyDone() } }
 </script>
 <p>Download file name should be "test file.txt".</p>
 <iframe src="resources/basic-ascii.py"></iframe>

LayoutTests/http/tests/download/literal-utf-8.html

@@ -3,7 +3,9 @@
 if (window.testRunner) {
     testRunner.dumpAsText();
     testRunner.setCustomPolicyDelegate(true, true);
+    if (testRunner.skipPolicyDelegateNotifyDone) { testRunner.skipPolicyDelegateNotifyDone() }
 }
+onload = () => { if (window.testRunner) { testRunner.notifyDone() } }
 </script>
 <p>Downloaded file name should be "SUóóåSS.txt" (letters "CCE" are Cyrillic).</p>
 <iframe src="resources/literal-utf-8.py"></iframe>

LayoutTests/http/tests/misc/policy-delegate-called-twice-expected.txt

@@ -1,4 +1,4 @@
-Policy delegate: attempt to load http://127.0.0.1:8000/misc/resources/iframe-policy-2.html with navigation type 'link clicked' originating from HTML > #document
+Policy delegate: attempt to load http://127.0.0.1:8000/misc/resources/iframe-policy-2.html with navigation type 'link clicked'
 This page has an iframe which will navigate itself. The policy delegate callbacks will be dumped. The delegate should only be consulted once.
 
 

LayoutTests/http/tests/misc/resources/iframe-policy-1.html

@@ -2,8 +2,10 @@
 <head>
 <script>
 
-if (window.testRunner)
+if (window.testRunner) {
     testRunner.setCustomPolicyDelegate(true, true);
+    if (testRunner.skipPolicyDelegateNotifyDone) { testRunner.skipPolicyDelegateNotifyDone() }
+}
 
 function runTest()
 {

LayoutTests/platform/mac-wk1/fast/encoding/mailto-always-utf-8-expected.txt

@@ -0,0 +1,4 @@
+Policy delegate: attempt to load mailto:?subject=%E3%82%BF%E3%82%A4%E3%83%88%E3%83%AB&body=%E6%9C%AC%E6%96%87 with navigation type 'link clicked' originating from #text > SPAN > A > BODY > HTML > #document
+Test encoding of mailto URLs. Click on the URL - a new message with Japanese subject and body should open in your mail client.
+
+Subject : Japanese Body : Japanese

LayoutTests/platform/mac-wk1/fast/forms/mailto/formenctype-attribute-button-html-expected.txt

@@ -0,0 +1,2 @@
+Policy delegate: attempt to load mailto:?body=to%3Done%40example.org%0D%0Abody%3DLine%201%0D%0ALine%202%0D%0A%40%0D%0A%3D%2C%3B%3F%22%20%0D%0A with navigation type 'form submitted' originating from HTML > #document
+Field 1:  Field 2:

LayoutTests/platform/mac-wk1/fast/forms/mailto/formenctype-attribute-input-2-expected.txt

@@ -0,0 +1,2 @@
+Policy delegate: attempt to load mailto:?body=to%3Done%40example.org%0D%0Abody%3DLine%201%0D%0ALine%202%0D%0A%40%0D%0A%3D%2C%3B%3F%20%0D%0A with navigation type 'form submitted' originating from INPUT > FORM > BODY > HTML > #document
+Field 1:  Field 2:

LayoutTests/platform/mac-wk1/fast/forms/mailto/formenctype-attribute-input-html-expected.txt

@@ -0,0 +1,2 @@
+Policy delegate: attempt to load mailto:?body=to%3Done%40example.org%0D%0Abody%3DLine%201%0D%0ALine%202%0D%0A%40%0D%0A%3D%2C%3B%3F%22%20%0D%0A with navigation type 'form submitted' originating from HTML > #document
+Field 1:  Field 2:

LayoutTests/platform/mac-wk1/fast/loader/policy-delegate-action-hit-test-zoomed-expected.txt

@@ -0,0 +1,6 @@
+Policy delegate: attempt to load about:blank with navigation type 'link clicked' originating from #text > A > BODY > HTML > #document
+This is a test for rdar://problem/6755137 Action dictionary for policy decision is missing keys when full-page zoom is used.
+
+Link
+The policy delegate message should indicate that the originating node is the text child of an anchor element.
+

LayoutTests/platform/mac-wk1/http/tests/misc/policy-delegate-called-twice-expected.txt

@@ -0,0 +1,8 @@
+Policy delegate: attempt to load http://127.0.0.1:8000/misc/resources/iframe-policy-2.html with navigation type 'link clicked' originating from HTML > #document
+This page has an iframe which will navigate itself. The policy delegate callbacks will be dumped. The delegate should only be consulted once.
+
+
+--------
+Frame: '<!--frame1-->'
+--------
+You've reached the second page. Congratulations.

LayoutTests/platform/win/fast/encoding/mailto-always-utf-8-expected.txt

@@ -0,0 +1,4 @@
+Policy delegate: attempt to load mailto:?subject=%E3%82%BF%E3%82%A4%E3%83%88%E3%83%AB&body=%E6%9C%AC%E6%96%87 with navigation type 'link clicked' originating from #text > SPAN > A > BODY > HTML > #document
+Test encoding of mailto URLs. Click on the URL - a new message with Japanese subject and body should open in your mail client.
+
+Subject : Japanese Body : Japanese

LayoutTests/platform/win/fast/forms/mailto/formenctype-attribute-button-html-expected.txt

@@ -0,0 +1,2 @@
+Policy delegate: attempt to load mailto:?body=to%3Done%40example.org%0D%0Abody%3DLine%201%0D%0ALine%202%0D%0A%40%0D%0A%3D%2C%3B%3F%22%20%0D%0A with navigation type 'form submitted' originating from HTML > #document
+Field 1:  Field 2:

LayoutTests/platform/win/fast/forms/mailto/formenctype-attribute-input-2-expected.txt

@@ -0,0 +1,2 @@
+Policy delegate: attempt to load mailto:?body=to%3Done%40example.org%0D%0Abody%3DLine%201%0D%0ALine%202%0D%0A%40%0D%0A%3D%2C%3B%3F%20%0D%0A with navigation type 'form submitted' originating from INPUT > FORM > BODY > HTML > #document
+Field 1:  Field 2:

LayoutTests/platform/win/fast/forms/mailto/formenctype-attribute-input-html-expected.txt

@@ -0,0 +1,2 @@
+Policy delegate: attempt to load mailto:?body=to%3Done%40example.org%0D%0Abody%3DLine%201%0D%0ALine%202%0D%0A%40%0D%0A%3D%2C%3B%3F%22%20%0D%0A with navigation type 'form submitted' originating from HTML > #document
+Field 1:  Field 2:

LayoutTests/platform/win/fast/loader/policy-delegate-action-hit-test-zoomed-expected.txt

@@ -0,0 +1,6 @@
+Policy delegate: attempt to load about:blank with navigation type 'link clicked' originating from #text > A > BODY > HTML > #document
+This is a test for rdar://problem/6755137 Action dictionary for policy decision is missing keys when full-page zoom is used.
+
+Link
+The policy delegate message should indicate that the originating node is the text child of an anchor element.
+

LayoutTests/platform/win/http/tests/misc/policy-delegate-called-twice-expected.txt

@@ -0,0 +1,8 @@
+Policy delegate: attempt to load http://127.0.0.1:8000/misc/resources/iframe-policy-2.html with navigation type 'link clicked' originating from HTML > #document
+This page has an iframe which will navigate itself. The policy delegate callbacks will be dumped. The delegate should only be consulted once.
+
+
+--------
+Frame: '<!--frame1-->'
+--------
+You've reached the second page. Congratulations.

Source/WebKit/Sources.txt

@@ -636,7 +636,6 @@ WebProcess/InjectedBundle/InjectedBundlePageEditorClient.cpp
 WebProcess/InjectedBundle/InjectedBundlePageFormClient.cpp
 WebProcess/InjectedBundle/InjectedBundlePageFullScreenClient.cpp
 WebProcess/InjectedBundle/InjectedBundlePageLoaderClient.cpp
-WebProcess/InjectedBundle/InjectedBundlePagePolicyClient.cpp
 WebProcess/InjectedBundle/InjectedBundlePageResourceLoadClient.cpp
 WebProcess/InjectedBundle/InjectedBundlePageUIClient.cpp
 WebProcess/InjectedBundle/InjectedBundleScriptWorld.cpp

Source/WebKit/UIProcess/API/C/WKFrameInfoRef.cpp

@@ -31,20 +31,23 @@
 #include "APISecurityOrigin.h"
 #include "WKAPICast.h"
 
-using namespace WebKit;
-
 WKTypeID WKFrameInfoGetTypeID()
 {
-    return toAPI(API::FrameInfo::APIType);
+    return WebKit::toAPI(API::FrameInfo::APIType);
+}
+
+WKFrameHandleRef WKFrameInfoCreateFrameHandleRef(WKFrameInfoRef frameInfo)
+{
+    return WebKit::toAPI(&WebKit::toImpl(frameInfo)->handle().leakRef());
 }
 
-WKFrameHandleRef WKFrameInfoCreateFrameHandleRef(WKFrameInfoRef frameInfoRef)
+WKSecurityOriginRef WKFrameInfoCopySecurityOrigin(WKFrameInfoRef frameInfo)
 {
-    return toAPI(&toImpl(frameInfoRef)->handle().leakRef());
+    auto origin = WebKit::toImpl(frameInfo)->securityOrigin();
+    return WebKit::toAPI(&API::SecurityOrigin::create(origin.protocol, origin.host, origin.port).leakRef());
 }
 
-WKSecurityOriginRef WKFrameInfoCopySecurityOrigin(WKFrameInfoRef frameInfoRef)
+bool WKFrameInfoGetIsMainFrame(WKFrameInfoRef frameInfo)
 {
-    auto origin = toImpl(frameInfoRef)->securityOrigin();
-    return toAPI(&API::SecurityOrigin::create(origin.protocol, origin.host, origin.port).leakRef());
+    return WebKit::toImpl(frameInfo)->isMainFrame();
 }

Source/WebKit/UIProcess/API/C/WKFrameInfoRef.h

@@ -34,7 +34,8 @@ extern "C" {
 
 WK_EXPORT WKTypeID WKFrameInfoGetTypeID();
 WK_EXPORT WKFrameHandleRef WKFrameInfoCreateFrameHandleRef(WKFrameInfoRef frameInfo);
-WK_EXPORT WKSecurityOriginRef WKFrameInfoCopySecurityOrigin(WKFrameInfoRef frameInfoRef);
+WK_EXPORT WKSecurityOriginRef WKFrameInfoCopySecurityOrigin(WKFrameInfoRef frameInfo);
+WK_EXPORT bool WKFrameInfoGetIsMainFrame(WKFrameInfoRef frameInfo);
 
 #ifdef __cplusplus
 }

Source/WebKit/UIProcess/API/C/WKNavigationActionRef.cpp

@@ -29,14 +29,33 @@
 #include "APINavigationAction.h"
 #include "WKAPICast.h"
 
-using namespace WebKit;
-
 WKTypeID WKNavigationActionGetTypeID()
 {
-    return toAPI(API::NavigationAction::APIType);
+    return WebKit::toAPI(API::NavigationAction::APIType);
 }
 
 bool WKNavigationActionShouldPerformDownload(WKNavigationActionRef action)
 {
-    return toImpl(action)->shouldPerformDownload();
+    return WebKit::toImpl(action)->shouldPerformDownload();
+}
+
+WKURLRequestRef WKNavigationActionCopyRequest(WKNavigationActionRef action)
+{
+    return WebKit::toAPI(&API::URLRequest::create(WebKit::toImpl(action)->request()).leakRef());
+}
+
+bool WKNavigationActionGetShouldOpenExternalSchemes(WKNavigationActionRef action)
+{
+    return WebKit::toImpl(action)->shouldOpenExternalSchemes();
+}
+
+WKFrameInfoRef WKNavigationActionCopyTargetFrameInfo(WKNavigationActionRef action)
+{
+    RefPtr targetFrame = WebKit::toImpl(action)->targetFrame();
+    return targetFrame ? WebKit::toAPI(targetFrame.leakRef()) : nullptr;
+}
+
+WKFrameNavigationType WKNavigationActionGetNavigationType(WKNavigationActionRef action)
+{
+    return WebKit::toAPI(WebKit::toImpl(action)->navigationType());
 }

Source/WebKit/UIProcess/API/C/WKNavigationActionRef.h

@@ -27,6 +27,7 @@
 #define WKNavigationActionRef_h
 
 #include <WebKit/WKBase.h>
+#include <WebKit/WKPageLoadTypes.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -35,6 +36,10 @@ extern "C" {
 WK_EXPORT WKTypeID WKNavigationActionGetTypeID();
 
 WK_EXPORT bool WKNavigationActionShouldPerformDownload(WKNavigationActionRef action);
+WK_EXPORT WKURLRequestRef WKNavigationActionCopyRequest(WKNavigationActionRef action);
+WK_EXPORT bool WKNavigationActionGetShouldOpenExternalSchemes(WKNavigationActionRef action);
+WK_EXPORT WKFrameInfoRef WKNavigationActionCopyTargetFrameInfo(WKNavigationActionRef action);
+WK_EXPORT WKFrameNavigationType WKNavigationActionGetNavigationType(WKNavigationActionRef action);
 
 #ifdef __cplusplus
 }

Source/WebKit/UIProcess/API/C/WKNavigationResponseRef.cpp

@@ -29,14 +29,17 @@
 #include "APINavigationResponse.h"
 #include "WKAPICast.h"
 
-using namespace WebKit;
-
 WKTypeID WKNavigationResponseGetTypeID()
 {
-    return toAPI(API::NavigationResponse::APIType);
+    return WebKit::toAPI(API::NavigationResponse::APIType);
 }
 
 bool WKNavigationResponseCanShowMIMEType(WKNavigationResponseRef response)
 {
-    return toImpl(response)->canShowMIMEType();
+    return WebKit::toImpl(response)->canShowMIMEType();
+}
+
+WKURLResponseRef WKNavigationResponseCopyResponse(WKNavigationResponseRef response)
+{
+    return WebKit::toAPI(API::URLResponse::create(WebKit::toImpl(response)->response()).leakRef());
 }

Source/WebKit/UIProcess/API/C/WKNavigationResponseRef.h

@@ -35,6 +35,7 @@ extern "C" {
 WK_EXPORT WKTypeID WKNavigationResponseGetTypeID();
 
 WK_EXPORT bool WKNavigationResponseCanShowMIMEType(WKNavigationResponseRef);
+WK_EXPORT WKURLResponseRef WKNavigationResponseCopyResponse(WKNavigationResponseRef);
 
 #ifdef __cplusplus
 }

Source/WebKit/WebKit.xcodeproj/project.pbxproj

@@ -1846,7 +1846,6 @@
 		BC7B621512A4219A00D174A4 /* WebPageGroupProxy.h in Headers */ = {isa = PBXBuildFile; fileRef = BC7B621312A4219A00D174A4 /* WebPageGroupProxy.h */; };
 		BC7B625212A43C9600D174A4 /* WebPageGroupData.h in Headers */ = {isa = PBXBuildFile; fileRef = BC7B625012A43C9600D174A4 /* WebPageGroupData.h */; };
 		BC7B633712A45ABA00D174A4 /* WKPageGroup.h in Headers */ = {isa = PBXBuildFile; fileRef = BC7B633512A45ABA00D174A4 /* WKPageGroup.h */; settings = {ATTRIBUTES = (Private, ); }; };
-		BC8147A912F64CDA007B2C32 /* InjectedBundlePagePolicyClient.h in Headers */ = {isa = PBXBuildFile; fileRef = BC8147A712F64CDA007B2C32 /* InjectedBundlePagePolicyClient.h */; };
 		BC8147D512F66D31007B2C32 /* InjectedBundleNavigationAction.h in Headers */ = {isa = PBXBuildFile; fileRef = BC8147D312F66D31007B2C32 /* InjectedBundleNavigationAction.h */; };
 		BC8283DA16B4DB9300A278FE /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8DC2EF5B0486A6940098B216 /* WebKit.framework */; };
 		BC8452A81162C80900CAB9B5 /* DrawingArea.h in Headers */ = {isa = PBXBuildFile; fileRef = BC8452A61162C80900CAB9B5 /* DrawingArea.h */; };
@@ -6656,8 +6655,6 @@
 		BC7B625112A43C9600D174A4 /* WebPageGroupData.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebPageGroupData.cpp; sourceTree = "<group>"; };
 		BC7B633512A45ABA00D174A4 /* WKPageGroup.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKPageGroup.h; sourceTree = "<group>"; };
 		BC7B633612A45ABA00D174A4 /* WKPageGroup.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WKPageGroup.cpp; sourceTree = "<group>"; };
-		BC8147A712F64CDA007B2C32 /* InjectedBundlePagePolicyClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InjectedBundlePagePolicyClient.h; sourceTree = "<group>"; wrapsLines = 0; };
-		BC8147A812F64CDA007B2C32 /* InjectedBundlePagePolicyClient.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InjectedBundlePagePolicyClient.cpp; sourceTree = "<group>"; wrapsLines = 0; };
 		BC8147D312F66D31007B2C32 /* InjectedBundleNavigationAction.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InjectedBundleNavigationAction.h; sourceTree = "<group>"; };
 		BC8147D412F66D31007B2C32 /* InjectedBundleNavigationAction.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InjectedBundleNavigationAction.cpp; sourceTree = "<group>"; };
 		BC82839616B47EC400A278FE /* XPCServiceMain.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = XPCServiceMain.mm; sourceTree = "<group>"; };
@@ -12846,8 +12843,6 @@
 				CD5C669F134B9D37004FE2A8 /* InjectedBundlePageFullScreenClient.h */,
 				BCA8C6A611E3BA5F00812FB7 /* InjectedBundlePageLoaderClient.cpp */,
 				BCA8C6A711E3BA5F00812FB7 /* InjectedBundlePageLoaderClient.h */,
-				BC8147A812F64CDA007B2C32 /* InjectedBundlePagePolicyClient.cpp */,
-				BC8147A712F64CDA007B2C32 /* InjectedBundlePagePolicyClient.h */,
 				6546A82913000164000CEB1C /* InjectedBundlePageResourceLoadClient.cpp */,
 				6546A82A13000164000CEB1C /* InjectedBundlePageResourceLoadClient.h */,
 				BCA8C6AD11E3C08700812FB7 /* InjectedBundlePageUIClient.cpp */,
@@ -14968,7 +14963,6 @@
 				BC14E10A120B905E00826C0C /* InjectedBundlePageFormClient.h in Headers */,
 				CD5C66A1134B9D38004FE2A8 /* InjectedBundlePageFullScreenClient.h in Headers */,
 				BCA8C6A911E3BA5F00812FB7 /* InjectedBundlePageLoaderClient.h in Headers */,
-				BC8147A912F64CDA007B2C32 /* InjectedBundlePagePolicyClient.h in Headers */,
 				BCA8C6B011E3C08700812FB7 /* InjectedBundlePageUIClient.h in Headers */,
 				BC33E0D112408E8600360F3F /* InjectedBundleRangeHandle.h in Headers */,
 				BC14DF77120B5B7900826C0C /* InjectedBundleScriptWorld.h in Headers */,

Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundlePage.cpp

@@ -108,9 +108,8 @@ void WKBundlePageSetResourceLoadClient(WKBundlePageRef pageRef, WKBundlePageReso
     WebKit::toImpl(pageRef)->setInjectedBundleResourceLoadClient(makeUnique<WebKit::InjectedBundlePageResourceLoadClient>(wkClient));
 }
 
-void WKBundlePageSetPolicyClient(WKBundlePageRef pageRef, WKBundlePagePolicyClientBase* wkClient)
+void WKBundlePageSetPolicyClient(WKBundlePageRef, WKBundlePagePolicyClientBase*)
 {
-    WebKit::toImpl(pageRef)->initializeInjectedBundlePolicyClient(wkClient);
 }
 
 void WKBundlePageSetUIClient(WKBundlePageRef pageRef, WKBundlePageUIClientBase* wkClient)