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

Unified Diff: net/spdy/spdy_session_unittest.cc

Issue 1580903002: Convert ignore_limits from a SocketParam to a socket request argument. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Missed one Created 4 years, 11 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/spdy/spdy_session_unittest.cc
diff --git a/net/spdy/spdy_session_unittest.cc b/net/spdy/spdy_session_unittest.cc
index dda8d949b23068c723ed83602d70fae1c51c6324..5f9f25c3a16f5354d76ebcd52d1c4e98f6038ef0 100644
--- a/net/spdy/spdy_session_unittest.cc
+++ b/net/spdy/spdy_session_unittest.cc
@@ -3186,13 +3186,13 @@ TEST_P(SpdySessionTest, CloseOneIdleConnection) {
// post a task asynchronously to try and close the session.
TestCompletionCallback callback2;
HostPortPair host_port2("2.com", 80);
- scoped_refptr<TransportSocketParams> params2(
- new TransportSocketParams(
- host_port2, false, false, OnHostResolutionCallback(),
- TransportSocketParams::COMBINE_CONNECT_AND_WRITE_DEFAULT));
+ scoped_refptr<TransportSocketParams> params2(new TransportSocketParams(
+ host_port2, false, OnHostResolutionCallback(),
+ TransportSocketParams::COMBINE_CONNECT_AND_WRITE_DEFAULT));
scoped_ptr<ClientSocketHandle> connection2(new ClientSocketHandle);
EXPECT_EQ(ERR_IO_PENDING,
connection2->Init(host_port2.ToString(), params2, DEFAULT_PRIORITY,
+ ClientSocketPool::IgnoreLimits::DISABLED,
callback2.callback(), pool, BoundNetLog()));
EXPECT_TRUE(pool->IsStalled());
@@ -3261,13 +3261,13 @@ TEST_P(SpdySessionTest, CloseOneIdleConnectionWithAlias) {
// post a task asynchronously to try and close the session.
TestCompletionCallback callback3;
HostPortPair host_port3("3.com", 80);
- scoped_refptr<TransportSocketParams> params3(
- new TransportSocketParams(
- host_port3, false, false, OnHostResolutionCallback(),
- TransportSocketParams::COMBINE_CONNECT_AND_WRITE_DEFAULT));
+ scoped_refptr<TransportSocketParams> params3(new TransportSocketParams(
+ host_port3, false, OnHostResolutionCallback(),
+ TransportSocketParams::COMBINE_CONNECT_AND_WRITE_DEFAULT));
scoped_ptr<ClientSocketHandle> connection3(new ClientSocketHandle);
EXPECT_EQ(ERR_IO_PENDING,
connection3->Init(host_port3.ToString(), params3, DEFAULT_PRIORITY,
+ ClientSocketPool::IgnoreLimits::DISABLED,
callback3.callback(), pool, BoundNetLog()));
EXPECT_TRUE(pool->IsStalled());
@@ -3342,13 +3342,13 @@ TEST_P(SpdySessionTest, CloseSessionOnIdleWhenPoolStalled) {
// post a task asynchronously to try and close the session.
TestCompletionCallback callback2;
HostPortPair host_port2("2.com", 80);
- scoped_refptr<TransportSocketParams> params2(
- new TransportSocketParams(
- host_port2, false, false, OnHostResolutionCallback(),
- TransportSocketParams::COMBINE_CONNECT_AND_WRITE_DEFAULT));
+ scoped_refptr<TransportSocketParams> params2(new TransportSocketParams(
+ host_port2, false, OnHostResolutionCallback(),
+ TransportSocketParams::COMBINE_CONNECT_AND_WRITE_DEFAULT));
scoped_ptr<ClientSocketHandle> connection2(new ClientSocketHandle);
EXPECT_EQ(ERR_IO_PENDING,
connection2->Init(host_port2.ToString(), params2, DEFAULT_PRIORITY,
+ ClientSocketPool::IgnoreLimits::DISABLED,
callback2.callback(), pool, BoundNetLog()));
EXPECT_TRUE(pool->IsStalled());

Powered by Google App Engine
This is Rietveld 408576698