| Index: net/websockets/websocket_end_to_end_test.cc
|
| diff --git a/net/websockets/websocket_end_to_end_test.cc b/net/websockets/websocket_end_to_end_test.cc
|
| index d2cad9c7949a40e4d1ea6ae7d872753d724cbc8f..e675d8b39512db7ec10dc2634d48212e63c88ecd 100644
|
| --- a/net/websockets/websocket_end_to_end_test.cc
|
| +++ b/net/websockets/websocket_end_to_end_test.cc
|
| @@ -385,14 +385,12 @@
|
|
|
| // Regression test for crbug.com/455215 "HSTS not applied to WebSocket"
|
| TEST_F(WebSocketEndToEndTest, DISABLED_ON_ANDROID(HstsHttpsToWebSocket)) {
|
| - SpawnedTestServer::SSLOptions ssl_options(
|
| - SpawnedTestServer::SSLOptions::CERT_OK_FOR_LOCALHOST);
|
| + SpawnedTestServer::SSLOptions ssl_options;
|
| SpawnedTestServer https_server(
|
| SpawnedTestServer::TYPE_HTTPS, ssl_options,
|
| base::FilePath(FILE_PATH_LITERAL("net/data/url_request_unittest")));
|
| SpawnedTestServer wss_server(SpawnedTestServer::TYPE_WSS, ssl_options,
|
| GetWebSocketTestDataDirectory());
|
| -
|
| ASSERT_TRUE(https_server.StartInBackground());
|
| ASSERT_TRUE(wss_server.StartInBackground());
|
| ASSERT_TRUE(https_server.BlockUntilStarted());
|
| @@ -415,8 +413,7 @@
|
| }
|
|
|
| TEST_F(WebSocketEndToEndTest, DISABLED_ON_ANDROID(HstsWebSocketToHttps)) {
|
| - SpawnedTestServer::SSLOptions ssl_options(
|
| - SpawnedTestServer::SSLOptions::CERT_OK_FOR_LOCALHOST);
|
| + SpawnedTestServer::SSLOptions ssl_options;
|
| SpawnedTestServer https_server(
|
| SpawnedTestServer::TYPE_HTTPS, ssl_options,
|
| base::FilePath(FILE_PATH_LITERAL("net/data/url_request_unittest")));
|
| @@ -445,8 +442,7 @@
|
| }
|
|
|
| TEST_F(WebSocketEndToEndTest, DISABLED_ON_ANDROID(HstsWebSocketToWebSocket)) {
|
| - SpawnedTestServer::SSLOptions ssl_options(
|
| - SpawnedTestServer::SSLOptions::CERT_OK_FOR_LOCALHOST);
|
| + SpawnedTestServer::SSLOptions ssl_options;
|
| SpawnedTestServer wss_server(SpawnedTestServer::TYPE_WSS, ssl_options,
|
| GetWebSocketTestDataDirectory());
|
| ASSERT_TRUE(wss_server.Start());
|
|
|