Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(814)

Unified Diff: net/socket/websocket_transport_client_socket_pool_unittest.cc

Issue 451383002: Plumbing for TCP FastOpen for SSL sockets. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: TFO not enabled when Happy Eyeballs may be used. Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: net/socket/websocket_transport_client_socket_pool_unittest.cc
diff --git a/net/socket/websocket_transport_client_socket_pool_unittest.cc b/net/socket/websocket_transport_client_socket_pool_unittest.cc
index 38ad6f0588f59e3ed6e7e3086cd78bd5b16408d0..87bc2b3a3f6cace20ab5060a3c74da0b46ddaca9 100644
--- a/net/socket/websocket_transport_client_socket_pool_unittest.cc
+++ b/net/socket/websocket_transport_client_socket_pool_unittest.cc
@@ -54,7 +54,8 @@ class WebSocketTransportClientSocketPoolTest : public testing::Test {
: params_(new TransportSocketParams(HostPortPair("www.google.com", 80),
false,
false,
- OnHostResolutionCallback())),
+ OnHostResolutionCallback(),
+ AUTO_CONNECT_USE_DEFAULT)),
histograms_(new ClientSocketPoolHistograms("TCPUnitTest")),
host_resolver_(new MockHostResolver),
client_socket_factory_(&net_log_),
@@ -75,7 +76,8 @@ class WebSocketTransportClientSocketPoolTest : public testing::Test {
new TransportSocketParams(HostPortPair("www.google.com", 80),
false,
false,
- OnHostResolutionCallback()));
+ OnHostResolutionCallback(),
+ AUTO_CONNECT_USE_DEFAULT));
return test_base_.StartRequestUsingPool(
&pool_, group_name, priority, params);
}
@@ -148,7 +150,8 @@ TEST_F(WebSocketTransportClientSocketPoolTest, InitHostResolutionFailure) {
ClientSocketHandle handle;
HostPortPair host_port_pair("unresolvable.host.name", 80);
scoped_refptr<TransportSocketParams> dest(new TransportSocketParams(
- host_port_pair, false, false, OnHostResolutionCallback()));
+ host_port_pair, false, false, OnHostResolutionCallback(),
+ AUTO_CONNECT_USE_DEFAULT));
EXPECT_EQ(ERR_IO_PENDING,
handle.Init("a",
dest,
@@ -401,7 +404,8 @@ class RequestSocketCallback : public TestCompletionCallbackBase {
new TransportSocketParams(HostPortPair("www.google.com", 80),
false,
false,
- OnHostResolutionCallback()));
+ OnHostResolutionCallback(),
+ AUTO_CONNECT_USE_DEFAULT));
int rv =
handle_->Init("a", dest, LOWEST, callback(), pool_, BoundNetLog());
EXPECT_EQ(OK, rv);
@@ -423,7 +427,8 @@ TEST_F(WebSocketTransportClientSocketPoolTest, RequestTwice) {
new TransportSocketParams(HostPortPair("www.google.com", 80),
false,
false,
- OnHostResolutionCallback()));
+ OnHostResolutionCallback(),
+ AUTO_CONNECT_USE_DEFAULT));
int rv = handle.Init(
"a", dest, LOWEST, callback.callback(), &pool_, BoundNetLog());
ASSERT_EQ(ERR_IO_PENDING, rv);

Powered by Google App Engine
This is Rietveld 408576698