| 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..fafb547e01eddc94c0280269807dc6bc22fa9e0c 100644
|
| --- a/net/spdy/spdy_session_unittest.cc
|
| +++ b/net/spdy/spdy_session_unittest.cc
|
| @@ -3186,14 +3186,14 @@ 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,
|
| - callback2.callback(), pool, BoundNetLog()));
|
| + EXPECT_EQ(
|
| + ERR_IO_PENDING,
|
| + connection2->Init(host_port2.ToString(), params2, DEFAULT_PRIORITY, false,
|
| + callback2.callback(), pool, BoundNetLog()));
|
| EXPECT_TRUE(pool->IsStalled());
|
|
|
| // The socket pool should close the connection asynchronously and establish a
|
| @@ -3261,14 +3261,14 @@ 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,
|
| - callback3.callback(), pool, BoundNetLog()));
|
| + EXPECT_EQ(
|
| + ERR_IO_PENDING,
|
| + connection3->Init(host_port3.ToString(), params3, DEFAULT_PRIORITY, false,
|
| + callback3.callback(), pool, BoundNetLog()));
|
| EXPECT_TRUE(pool->IsStalled());
|
|
|
| // The socket pool should close the connection asynchronously and establish a
|
| @@ -3342,14 +3342,14 @@ 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,
|
| - callback2.callback(), pool, BoundNetLog()));
|
| + EXPECT_EQ(
|
| + ERR_IO_PENDING,
|
| + connection2->Init(host_port2.ToString(), params2, DEFAULT_PRIORITY, false,
|
| + callback2.callback(), pool, BoundNetLog()));
|
| EXPECT_TRUE(pool->IsStalled());
|
|
|
| // Running the message loop should cause the socket pool to ask the SPDY
|
|
|