Title: [244654] trunk/Tools
- Revision
- 244654
- Author
- [email protected]
- Date
- 2019-04-25 11:15:47 -0700 (Thu, 25 Apr 2019)
Log Message
Revert some code accidentally committed with r244653
https://bugs.webkit.org/show_bug.cgi?id=197131
* TestWebKitAPI/Tests/WebKitCocoa/Proxy.mm:
(TestWebKitAPI::TEST):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (244653 => 244654)
--- trunk/Tools/ChangeLog 2019-04-25 17:41:29 UTC (rev 244653)
+++ trunk/Tools/ChangeLog 2019-04-25 18:15:47 UTC (rev 244654)
@@ -1,5 +1,13 @@
2019-04-25 Alex Christensen <[email protected]>
+ Revert some code accidentally committed with r244653
+ https://bugs.webkit.org/show_bug.cgi?id=197131
+
+ * TestWebKitAPI/Tests/WebKitCocoa/Proxy.mm:
+ (TestWebKitAPI::TEST):
+
+2019-04-25 Alex Christensen <[email protected]>
+
Start using C++17
https://bugs.webkit.org/show_bug.cgi?id=197131
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/Proxy.mm (244653 => 244654)
--- trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/Proxy.mm 2019-04-25 17:41:29 UTC (rev 244653)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/Proxy.mm 2019-04-25 18:15:47 UTC (rev 244654)
@@ -27,10 +27,8 @@
#import "TCPServer.h"
#import "Utilities.h"
-#import <WebKit/WKProcessPoolPrivate.h>
#import <WebKit/WKWebsiteDataStorePrivate.h>
#import <WebKit/WebKit.h>
-#import <WebKit/_WKProcessPoolConfiguration.h>
#import <WebKit/_WKWebsiteDataStoreConfiguration.h>
#import <wtf/RetainPtr.h>
@@ -66,7 +64,6 @@
const char* reply = ""
"HTTP/1.1 200 OK\r\n"
- "Strict-Transport-Security: max-age=16070400; includeSubDomains\r\n"
"Content-Length: 34\r\n\r\n"
"<script>alert('success!')</script>";
auto writeResult = SSL_write(ssl, reply, strlen(reply));
@@ -73,19 +70,10 @@
ASSERT_UNUSED(writeResult, writeResult == static_cast<int>(strlen(reply)));
});
- RetainPtr<NSString> tempDir = NSTemporaryDirectory();
- WTFLogAlways("ORIGINAL TEMP DIR %@", tempDir.get());
- if ([tempDir hasSuffix:@"/"])
- tempDir = [tempDir substringWithRange:NSMakeRange(0, [tempDir length] - 1)];
-
- WTFLogAlways("TEMP DIR %@", tempDir.get());
- auto poolConfiguration = adoptNS([_WKProcessPoolConfiguration new]);
- [poolConfiguration setHSTSStorageDirectory:tempDir.get()];
auto storeConfiguration = adoptNS([_WKWebsiteDataStoreConfiguration new]);
[storeConfiguration setHTTPSProxy:[NSURL URLWithString:[NSString stringWithFormat:@"https://127.0.0.1:%d/", server.port()]]];
auto viewConfiguration = adoptNS([WKWebViewConfiguration new]);
[viewConfiguration setWebsiteDataStore:[[[WKWebsiteDataStore alloc] _initWithConfiguration:storeConfiguration.get()] autorelease]];
- [viewConfiguration setProcessPool:[[[WKProcessPool alloc] _initWithConfiguration:poolConfiguration.get()] autorelease]];
auto webView = adoptNS([[WKWebView alloc] initWithFrame:CGRectMake(0, 0, 100, 100) configuration:viewConfiguration.get()]);
auto delegate = adoptNS([ProxyDelegate new]);
[webView setNavigationDelegate:delegate.get()];
@@ -93,13 +81,6 @@
[webView loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:@"https://example.com/"]]];
TestWebKitAPI::Util::run(&receivedAlert);
-
- RetainPtr<NSString> filePath = [tempDir stringByAppendingPathComponent:@"HSTS.plist"];
- WTFLogAlways("WAITING FOR FILE TO BE WRITTEN TO %@", filePath.get());
- while (![[NSFileManager defaultManager] fileExistsAtPath:filePath.get()])
- TestWebKitAPI::Util::spinRunLoop();
- [[NSFileManager defaultManager] removeItemAtPath:filePath.get() error:nil];
- WTFLogAlways("DONE");
}
} // namespace TestWebKitAPI
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
