<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[245149] trunk</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/245149">245149</a></dd>
<dt>Author</dt> <dd>achristensen@apple.com</dd>
<dt>Date</dt> <dd>2019-05-09 12:35:06 -0700 (Thu, 09 May 2019)</dd>
</dl>

<h3>Log Message</h3>
<pre>Remove unnecessary test SPI after <a href="http://trac.webkit.org/projects/webkit/changeset/244883">r244883</a>
https://bugs.webkit.org/show_bug.cgi?id=197575

Reviewed by Tim Horton.

Source/WebKit:

We now have two ways of doing the same thing.  Let's remove the one that's only for testing,
and make the tests clean up like an application would.

* NetworkProcess/NetworkProcess.cpp:
(WebKit::NetworkProcess::removeCredential): Deleted.
* NetworkProcess/NetworkProcess.h:
* NetworkProcess/NetworkProcess.messages.in:
* NetworkProcess/cocoa/NetworkProcessCocoa.mm:
(WebKit::NetworkProcess::removeCredential): Deleted.
* UIProcess/API/Cocoa/WKProcessPool.mm:
(-[WKProcessPool _removeCredential:forProtectionSpace:completionHandler:]): Deleted.
* UIProcess/API/Cocoa/WKProcessPoolPrivate.h:
* UIProcess/WebProcessPool.cpp:
(WebKit::WebProcessPool::removeCredential): Deleted.
* UIProcess/WebProcessPool.h:

Tools:

* TestWebKitAPI/Tests/WebKitCocoa/Challenge.mm:
(TEST):
* TestWebKitAPI/Tests/WebKitCocoa/WKWebsiteDatastore.mm:
(TestWebKitAPI::TEST):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKitChangeLog">trunk/Source/WebKit/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitNetworkProcessNetworkProcesscpp">trunk/Source/WebKit/NetworkProcess/NetworkProcess.cpp</a></li>
<li><a href="#trunkSourceWebKitNetworkProcessNetworkProcessh">trunk/Source/WebKit/NetworkProcess/NetworkProcess.h</a></li>
<li><a href="#trunkSourceWebKitNetworkProcessNetworkProcessmessagesin">trunk/Source/WebKit/NetworkProcess/NetworkProcess.messages.in</a></li>
<li><a href="#trunkSourceWebKitNetworkProcesscocoaNetworkProcessCocoamm">trunk/Source/WebKit/NetworkProcess/cocoa/NetworkProcessCocoa.mm</a></li>
<li><a href="#trunkSourceWebKitSharedmacSecItemShimcpp">trunk/Source/WebKit/Shared/mac/SecItemShim.cpp</a></li>
<li><a href="#trunkSourceWebKitUIProcessAPICocoaWKProcessPoolmm">trunk/Source/WebKit/UIProcess/API/Cocoa/WKProcessPool.mm</a></li>
<li><a href="#trunkSourceWebKitUIProcessAPICocoaWKProcessPoolPrivateh">trunk/Source/WebKit/UIProcess/API/Cocoa/WKProcessPoolPrivate.h</a></li>
<li><a href="#trunkSourceWebKitUIProcessWebProcessPoolcpp">trunk/Source/WebKit/UIProcess/WebProcessPool.cpp</a></li>
<li><a href="#trunkSourceWebKitUIProcessWebProcessPoolh">trunk/Source/WebKit/UIProcess/WebProcessPool.h</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKitCocoaChallengemm">trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/Challenge.mm</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKitCocoaWKWebsiteDatastoremm">trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/WKWebsiteDatastore.mm</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (245148 => 245149)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ChangeLog    2019-05-09 18:58:45 UTC (rev 245148)
+++ trunk/Source/WebKit/ChangeLog       2019-05-09 19:35:06 UTC (rev 245149)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2019-05-09  Alex Christensen  <achristensen@webkit.org>
+
+        Remove unnecessary test SPI after r244883
+        https://bugs.webkit.org/show_bug.cgi?id=197575
+
+        Reviewed by Tim Horton.
+
+        We now have two ways of doing the same thing.  Let's remove the one that's only for testing,
+        and make the tests clean up like an application would.
+
+        * NetworkProcess/NetworkProcess.cpp:
+        (WebKit::NetworkProcess::removeCredential): Deleted.
+        * NetworkProcess/NetworkProcess.h:
+        * NetworkProcess/NetworkProcess.messages.in:
+        * NetworkProcess/cocoa/NetworkProcessCocoa.mm:
+        (WebKit::NetworkProcess::removeCredential): Deleted.
+        * UIProcess/API/Cocoa/WKProcessPool.mm:
+        (-[WKProcessPool _removeCredential:forProtectionSpace:completionHandler:]): Deleted.
+        * UIProcess/API/Cocoa/WKProcessPoolPrivate.h:
+        * UIProcess/WebProcessPool.cpp:
+        (WebKit::WebProcessPool::removeCredential): Deleted.
+        * UIProcess/WebProcessPool.h:
+
</ins><span class="cx"> 2019-05-09  Daniel Bates  <dabates@apple.com>
</span><span class="cx"> 
</span><span class="cx">         REGRESSION (r241734): 1% slower PLT on iPad
</span></span></pre></div>
<a id="trunkSourceWebKitNetworkProcessNetworkProcesscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/NetworkProcess/NetworkProcess.cpp (245148 => 245149)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/NetworkProcess/NetworkProcess.cpp    2019-05-09 18:58:45 UTC (rev 245148)
+++ trunk/Source/WebKit/NetworkProcess/NetworkProcess.cpp       2019-05-09 19:35:06 UTC (rev 245149)
</span><span class="lines">@@ -2435,11 +2435,6 @@
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> #if !PLATFORM(COCOA)
</span><del>-void NetworkProcess::removeCredential(WebCore::Credential&&, WebCore::ProtectionSpace&&, CompletionHandler<void()>&& completionHandler)
-{
-    completionHandler();
-}
-
</del><span class="cx"> void NetworkProcess::originsWithPersistentCredentials(CompletionHandler<void(Vector<WebCore::SecurityOriginData>)>&& completionHandler)
</span><span class="cx"> {
</span><span class="cx">     completionHandler(Vector<WebCore::SecurityOriginData>());
</span></span></pre></div>
<a id="trunkSourceWebKitNetworkProcessNetworkProcessh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/NetworkProcess/NetworkProcess.h (245148 => 245149)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/NetworkProcess/NetworkProcess.h      2019-05-09 18:58:45 UTC (rev 245148)
+++ trunk/Source/WebKit/NetworkProcess/NetworkProcess.h 2019-05-09 19:35:06 UTC (rev 245149)
</span><span class="lines">@@ -428,8 +428,6 @@
</span><span class="cx"> 
</span><span class="cx">     void platformSyncAllCookies(CompletionHandler<void()>&&);
</span><span class="cx"> 
</span><del>-    void removeCredential(WebCore::Credential&&, WebCore::ProtectionSpace&&, CompletionHandler<void()>&&);
-
</del><span class="cx">     void originsWithPersistentCredentials(CompletionHandler<void(Vector<WebCore::SecurityOriginData>)>&&);
</span><span class="cx">     void removeCredentialsWithOrigins(const Vector<WebCore::SecurityOriginData>& origins, CompletionHandler<void()>&&);
</span><span class="cx">     
</span></span></pre></div>
<a id="trunkSourceWebKitNetworkProcessNetworkProcessmessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/NetworkProcess/NetworkProcess.messages.in (245148 => 245149)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/NetworkProcess/NetworkProcess.messages.in    2019-05-09 18:58:45 UTC (rev 245148)
+++ trunk/Source/WebKit/NetworkProcess/NetworkProcess.messages.in       2019-05-09 19:35:06 UTC (rev 245149)
</span><span class="lines">@@ -167,7 +167,6 @@
</span><span class="cx">     SetAdClickAttributionOverrideTimerForTesting(PAL::SessionID sessionID, bool value) -> () Async
</span><span class="cx">     SetAdClickAttributionConversionURLForTesting(PAL::SessionID sessionID, URL url) -> () Async
</span><span class="cx">     MarkAdClickAttributionsAsExpiredForTesting(PAL::SessionID sessionID) -> () Async
</span><del>-    RemoveCredential(WebCore::Credential credential, WebCore::ProtectionSpace protectionSpace) -> () Async
</del><span class="cx">     OriginsWithPersistentCredentials() -> (Vector<WebCore::SecurityOriginData> origins) Async
</span><span class="cx">     RemoveCredentialsWithOrigins(Vector<WebCore::SecurityOriginData> origins) -> () Async
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKitNetworkProcesscocoaNetworkProcessCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/NetworkProcess/cocoa/NetworkProcessCocoa.mm (245148 => 245149)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/NetworkProcess/cocoa/NetworkProcessCocoa.mm  2019-05-09 18:58:45 UTC (rev 245148)
+++ trunk/Source/WebKit/NetworkProcess/cocoa/NetworkProcessCocoa.mm     2019-05-09 19:35:06 UTC (rev 245149)
</span><span class="lines">@@ -212,18 +212,6 @@
</span><span class="cx">     }).get());
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void NetworkProcess::removeCredential(WebCore::Credential&& credential, WebCore::ProtectionSpace&& protectionSpace, CompletionHandler<void()>&& completionHandler)
-{
-    NSURLProtectionSpace *nsSpace = protectionSpace.nsSpace();
-    NSURLCredential *nsCredential = [[[NSURLCredentialStorage sharedCredentialStorage] credentialsForProtectionSpace:nsSpace] objectForKey:credential.user()];
-    RELEASE_ASSERT(nsCredential);
-    RELEASE_ASSERT([nsCredential.user isEqualToString:credential.user()]);
-    RELEASE_ASSERT([nsCredential.password isEqualToString:credential.password()]);
-    [[NSURLCredentialStorage sharedCredentialStorage] removeCredential:nsCredential forProtectionSpace:nsSpace];
-    RELEASE_ASSERT(![[[NSURLCredentialStorage sharedCredentialStorage] credentialsForProtectionSpace:nsSpace] objectForKey:credential.user()]);
-    completionHandler();
-}
-
</del><span class="cx"> void NetworkProcess::originsWithPersistentCredentials(CompletionHandler<void(Vector<WebCore::SecurityOriginData>)>&& completionHandler)
</span><span class="cx"> {
</span><span class="cx">     completionHandler(WebCore::CredentialStorage::originsWithPersistentCredentials());
</span></span></pre></div>
<a id="trunkSourceWebKitSharedmacSecItemShimcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/Shared/mac/SecItemShim.cpp (245148 => 245149)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/Shared/mac/SecItemShim.cpp   2019-05-09 18:58:45 UTC (rev 245148)
+++ trunk/Source/WebKit/Shared/mac/SecItemShim.cpp      2019-05-09 19:35:06 UTC (rev 245149)
</span><span class="lines">@@ -78,6 +78,7 @@
</span><span class="cx"> 
</span><span class="cx"> static Optional<SecItemResponseData> sendSecItemRequest(SecItemRequestData::Type requestType, CFDictionaryRef query, CFDictionaryRef attributesToMatch = 0)
</span><span class="cx"> {
</span><ins>+    WTFLogAlways("sendSecItemRequest CALLED BY ALEX");
</ins><span class="cx">     if (!globalNetworkProcess())
</span><span class="cx">         return WTF::nullopt;
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebKitUIProcessAPICocoaWKProcessPoolmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/WKProcessPool.mm (245148 => 245149)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/UIProcess/API/Cocoa/WKProcessPool.mm 2019-05-09 18:58:45 UTC (rev 245148)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/WKProcessPool.mm    2019-05-09 19:35:06 UTC (rev 245149)
</span><span class="lines">@@ -519,13 +519,6 @@
</span><span class="cx">     _processPool->preconnectToServer(serverURL);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-- (void)_removeCredential:(NSURLCredential *)credential forProtectionSpace:(NSURLProtectionSpace *)protectionSpace completionHandler:(void(^)())completionHandler
-{
-    _processPool->removeCredential(WebCore::Credential(credential), WebCore::ProtectionSpace(protectionSpace), [completionHandler = makeBlockPtr(completionHandler)] {
-        completionHandler();
-    });
-}
-
</del><span class="cx"> - (size_t)_pluginProcessCount
</span><span class="cx"> {
</span><span class="cx"> #if !PLATFORM(IOS_FAMILY)
</span></span></pre></div>
<a id="trunkSourceWebKitUIProcessAPICocoaWKProcessPoolPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/WKProcessPoolPrivate.h (245148 => 245149)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/UIProcess/API/Cocoa/WKProcessPoolPrivate.h   2019-05-09 18:58:45 UTC (rev 245148)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/WKProcessPoolPrivate.h      2019-05-09 19:35:06 UTC (rev 245149)
</span><span class="lines">@@ -116,9 +116,6 @@
</span><span class="cx"> - (void)_preconnectToServer:(NSURL *)serverURL WK_API_AVAILABLE(macos(10.13.4), ios(11.3));
</span><span class="cx"> 
</span><span class="cx"> // Test only.
</span><del>-- (void)_removeCredential:(NSURLCredential *)credential forProtectionSpace:(NSURLProtectionSpace *)protectionSpace completionHandler:(void(^)(void))completionHandler WK_API_AVAILABLE(macos(WK_MAC_TBA), ios(WK_IOS_TBA));
-
-// Test only.
</del><span class="cx"> - (void)_setAllowsAnySSLCertificateForServiceWorker:(BOOL)allows WK_API_AVAILABLE(macos(10.13.4), ios(11.3));
</span><span class="cx"> - (void)_registerURLSchemeServiceWorkersCanHandle:(NSString *)scheme WK_API_AVAILABLE(macos(10.13.4), ios(11.3));
</span><span class="cx"> - (void)_getActivePagesOriginsInWebProcessForTesting:(pid_t)pid completionHandler:(void(^)(NSArray<NSString *> *))completionHandler WK_API_AVAILABLE(macos(WK_MAC_TBA), ios(WK_IOS_TBA));
</span></span></pre></div>
<a id="trunkSourceWebKitUIProcessWebProcessPoolcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/UIProcess/WebProcessPool.cpp (245148 => 245149)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/UIProcess/WebProcessPool.cpp 2019-05-09 18:58:45 UTC (rev 245148)
+++ trunk/Source/WebKit/UIProcess/WebProcessPool.cpp    2019-05-09 19:35:06 UTC (rev 245149)
</span><span class="lines">@@ -1726,11 +1726,6 @@
</span><span class="cx">     m_shouldUseTestingNetworkSession = true;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void WebProcessPool::removeCredential(WebCore::Credential&& credential, WebCore::ProtectionSpace&& protectionSpace, CompletionHandler<void()>&& completionHandler)
-{
-    m_networkProcess->sendWithAsyncReply(Messages::NetworkProcess::RemoveCredential(credential, protectionSpace), WTFMove(completionHandler));
-}
-
</del><span class="cx"> template<typename T, typename U>
</span><span class="cx"> void WebProcessPool::sendSyncToNetworkingProcess(T&& message, U&& reply)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebKitUIProcessWebProcessPoolh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/UIProcess/WebProcessPool.h (245148 => 245149)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/UIProcess/WebProcessPool.h   2019-05-09 18:58:45 UTC (rev 245148)
+++ trunk/Source/WebKit/UIProcess/WebProcessPool.h      2019-05-09 19:35:06 UTC (rev 245149)
</span><span class="lines">@@ -507,8 +507,6 @@
</span><span class="cx"> 
</span><span class="cx">     void disableDelayedWebProcessLaunch() { m_isDelayedWebProcessLaunchDisabled = true; }
</span><span class="cx"> 
</span><del>-    void removeCredential(WebCore::Credential&&, WebCore::ProtectionSpace&&, CompletionHandler<void()>&&);
-    
</del><span class="cx"> private:
</span><span class="cx">     void platformInitialize();
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (245148 => 245149)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog    2019-05-09 18:58:45 UTC (rev 245148)
+++ trunk/Tools/ChangeLog       2019-05-09 19:35:06 UTC (rev 245149)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2019-05-09  Alex Christensen  <achristensen@webkit.org>
+
+        Remove unnecessary test SPI after r244883
+        https://bugs.webkit.org/show_bug.cgi?id=197575
+
+        Reviewed by Tim Horton.
+
+        * TestWebKitAPI/Tests/WebKitCocoa/Challenge.mm:
+        (TEST):
+        * TestWebKitAPI/Tests/WebKitCocoa/WKWebsiteDatastore.mm:
+        (TestWebKitAPI::TEST):
+
</ins><span class="cx"> 2019-05-09  Aakash Jain  <aakash_jain@apple.com>
</span><span class="cx"> 
</span><span class="cx">         [ews-app] Add migrations file to repository
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKitCocoaChallengemm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/Challenge.mm (245148 => 245149)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/Challenge.mm 2019-05-09 18:58:45 UTC (rev 245148)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/Challenge.mm    2019-05-09 19:35:06 UTC (rev 245149)
</span><span class="lines">@@ -31,6 +31,7 @@
</span><span class="cx"> #import "TestWKWebView.h"
</span><span class="cx"> #import "WKWebViewConfigurationExtras.h"
</span><span class="cx"> #import <WebKit/WKProcessPoolPrivate.h>
</span><ins>+#import <WebKit/WKWebsiteDataRecordPrivate.h>
</ins><span class="cx"> #import <wtf/RetainPtr.h>
</span><span class="cx"> 
</span><span class="cx"> static bool navigationFinished;
</span><span class="lines">@@ -302,10 +303,12 @@
</span><span class="cx">     Util::run(&navigationFinished);
</span><span class="cx">     EXPECT_TRUE(receivedSecondChallenge);
</span><span class="cx">     
</span><del>-    NSURLProtectionSpace *protectionSpace = [[[NSURLProtectionSpace alloc] initWithHost:@"127.0.0.1" port:server.port() protocol:NSURLProtectionSpaceHTTP realm:@"testrealm" authenticationMethod:NSURLAuthenticationMethodHTTPBasic] autorelease];
</del><span class="cx">     __block bool removedCredential = false;
</span><del>-    [[webView configuration].processPool _removeCredential:persistentCredential.get() forProtectionSpace:protectionSpace completionHandler:^{
-        removedCredential = true;
</del><ins>+    WKWebsiteDataStore *websiteDataStore = [webView configuration].websiteDataStore;
+    [websiteDataStore fetchDataRecordsOfTypes:[NSSet setWithObject:_WKWebsiteDataTypeCredentials] completionHandler:^(NSArray<WKWebsiteDataRecord *> *dataRecords) {
+        [websiteDataStore removeDataOfTypes:[NSSet setWithObject:_WKWebsiteDataTypeCredentials] forDataRecords:dataRecords completionHandler:^(void) {
+            removedCredential = true;
+        }];
</ins><span class="cx">     }];
</span><span class="cx">     Util::run(&removedCredential);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKitCocoaWKWebsiteDatastoremm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/WKWebsiteDatastore.mm (245148 => 245149)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/WKWebsiteDatastore.mm        2019-05-09 18:58:45 UTC (rev 245148)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/WKWebsiteDatastore.mm   2019-05-09 19:35:06 UTC (rev 245149)
</span><span class="lines">@@ -192,8 +192,10 @@
</span><span class="cx">     TestWebKitAPI::Util::run(&done);
</span><span class="cx">     
</span><span class="cx">     __block bool removedCredential = false;
</span><del>-    [[[webView configuration] processPool] _removeCredential:persistentCredential.get() forProtectionSpace:[[[NSURLProtectionSpace alloc] initWithHost:@"127.0.0.1" port:server.port() protocol:NSURLProtectionSpaceHTTP realm:@"testrealm" authenticationMethod:NSURLAuthenticationMethodHTTPBasic] autorelease] completionHandler:^{
-        removedCredential = true;
</del><ins>+    [websiteDataStore fetchDataRecordsOfTypes:[NSSet setWithObject:_WKWebsiteDataTypeCredentials] completionHandler:^(NSArray<WKWebsiteDataRecord *> *dataRecords) {
+        [websiteDataStore removeDataOfTypes:[NSSet setWithObject:_WKWebsiteDataTypeCredentials] forDataRecords:dataRecords completionHandler:^(void) {
+            removedCredential = true;
+        }];
</ins><span class="cx">     }];
</span><span class="cx">     TestWebKitAPI::Util::run(&removedCredential);
</span><span class="cx"> }
</span></span></pre>
</div>
</div>

</body>
</html>