summaryrefslogtreecommitdiff
path: root/chromium/net/websockets/websocket_end_to_end_test.cc
diff options
context:
space:
mode:
Diffstat (limited to 'chromium/net/websockets/websocket_end_to_end_test.cc')
-rw-r--r--chromium/net/websockets/websocket_end_to_end_test.cc11
1 files changed, 7 insertions, 4 deletions
diff --git a/chromium/net/websockets/websocket_end_to_end_test.cc b/chromium/net/websockets/websocket_end_to_end_test.cc
index 86e2580fa2b..caf50d9e26d 100644
--- a/chromium/net/websockets/websocket_end_to_end_test.cc
+++ b/chromium/net/websockets/websocket_end_to_end_test.cc
@@ -31,6 +31,7 @@
#include "net/base/auth.h"
#include "net/base/host_port_pair.h"
#include "net/base/ip_endpoint.h"
+#include "net/base/isolation_info.h"
#include "net/base/proxy_delegate.h"
#include "net/base/url_util.h"
#include "net/http/http_request_headers.h"
@@ -293,12 +294,14 @@ class WebSocketEndToEndTest : public TestWithTaskEnvironment {
url::Origin origin = url::Origin::Create(GURL("http://localhost"));
net::SiteForCookies site_for_cookies =
net::SiteForCookies::FromOrigin(origin);
- net::NetworkIsolationKey network_isolation_key(origin, origin);
+ IsolationInfo isolation_info = IsolationInfo::Create(
+ IsolationInfo::RedirectMode::kUpdateNothing, origin, origin,
+ SiteForCookies::FromOrigin(origin));
event_interface_ = new ConnectTestingEventInterface();
channel_ = std::make_unique<WebSocketChannel>(
base::WrapUnique(event_interface_), &context_);
channel_->SendAddChannelRequest(GURL(socket_url), sub_protocols_, origin,
- site_for_cookies, network_isolation_key,
+ site_for_cookies, isolation_info,
HttpRequestHeaders());
event_interface_->WaitForResponse();
return !event_interface_->failed();
@@ -465,8 +468,8 @@ TEST_F(WebSocketEndToEndTest, MAYBE_ProxyPacUsed) {
ProxyConfigWithAnnotation(proxy_config, TRAFFIC_ANNOTATION_FOR_TESTS));
std::unique_ptr<ProxyResolutionService> proxy_resolution_service(
ConfiguredProxyResolutionService::CreateUsingSystemProxyResolver(
- std::move(proxy_config_service), /*quick_check_enabled=*/true,
- NetLog::Get()));
+ std::move(proxy_config_service), NetLog::Get(),
+ /*quick_check_enabled=*/true));
ASSERT_EQ(ws_server.host_port_pair().host(), "127.0.0.1");
context_.set_proxy_resolution_service(proxy_resolution_service.get());
InitialiseContext();