Index: net/quic/quic_stream_factory_test.cc |
diff --git a/net/quic/quic_stream_factory_test.cc b/net/quic/quic_stream_factory_test.cc |
index 27903e9473ffb319ba59b2bd78803d059774096e..090fca1052b85e7e873f8aa69725668b9b090c44 100644 |
--- a/net/quic/quic_stream_factory_test.cc |
+++ b/net/quic/quic_stream_factory_test.cc |
@@ -52,10 +52,9 @@ class QuicStreamFactoryPeer { |
return factory->HasActiveSession(server_id); |
} |
- static QuicClientSession* GetActiveSession( |
- QuicStreamFactory* factory, |
- const HostPortPair& host_port_pair, |
- bool is_https) { |
+ static QuicClientSession* GetActiveSession(QuicStreamFactory* factory, |
+ const HostPortPair& host_port_pair, |
+ bool is_https) { |
QuicServerId server_id(host_port_pair, is_https, PRIVACY_MODE_DISABLED); |
DCHECK(factory->HasActiveSession(server_id)); |
return factory->active_sessions_[server_id]; |
@@ -74,7 +73,8 @@ class QuicStreamFactoryPeer { |
QuicClientSession* session) { |
for (QuicStreamFactory::SessionIdMap::iterator it = |
factory->all_sessions_.begin(); |
- it != factory->all_sessions_.end(); ++it) { |
+ it != factory->all_sessions_.end(); |
+ ++it) { |
if (it->first == session) |
return true; |
} |
@@ -89,12 +89,18 @@ class QuicStreamFactoryTest : public ::testing::TestWithParam<QuicVersion> { |
maker_(GetParam(), 0), |
clock_(new MockClock()), |
cert_verifier_(CertVerifier::CreateDefault()), |
- factory_(&host_resolver_, &socket_factory_, |
+ factory_(&host_resolver_, |
+ &socket_factory_, |
base::WeakPtr<HttpServerProperties>(), |
cert_verifier_.get(), |
&crypto_client_stream_factory_, |
- &random_generator_, clock_, kDefaultMaxPacketSize, |
- SupportedVersions(GetParam()), true, true, true), |
+ &random_generator_, |
+ clock_, |
+ kDefaultMaxPacketSize, |
+ SupportedVersions(GetParam()), |
+ true, |
+ true, |
+ true), |
host_port_pair_(kDefaultServerHostName, kDefaultServerPort), |
is_https_(false), |
privacy_mode_(PRIVACY_MODE_DISABLED) { |
@@ -112,8 +118,7 @@ class QuicStreamFactoryTest : public ::testing::TestWithParam<QuicVersion> { |
return GetSourcePortForNewSessionInner(destination, false); |
} |
- int GetSourcePortForNewSessionAndGoAway( |
- const HostPortPair& destination) { |
+ int GetSourcePortForNewSessionAndGoAway(const HostPortPair& destination) { |
return GetSourcePortForNewSessionInner(destination, true); |
} |
@@ -124,7 +129,7 @@ class QuicStreamFactoryTest : public ::testing::TestWithParam<QuicVersion> { |
size_t socket_count = socket_factory_.udp_client_sockets().size(); |
MockRead reads[] = { |
- MockRead(ASYNC, OK, 0) // EOF |
+ MockRead(ASYNC, OK, 0) // EOF |
}; |
DeterministicSocketData socket_data(reads, arraysize(reads), NULL, 0); |
socket_data.StopAfter(1); |
@@ -153,8 +158,8 @@ class QuicStreamFactoryTest : public ::testing::TestWithParam<QuicVersion> { |
} |
IPEndPoint endpoint; |
- socket_factory_. |
- udp_client_sockets()[socket_count]->GetLocalAddress(&endpoint); |
+ socket_factory_.udp_client_sockets()[socket_count]->GetLocalAddress( |
+ &endpoint); |
int port = endpoint.port(); |
if (goaway_received) { |
QuicGoAwayFrame goaway(QUIC_NO_ERROR, 1, ""); |
@@ -171,7 +176,9 @@ class QuicStreamFactoryTest : public ::testing::TestWithParam<QuicVersion> { |
scoped_ptr<QuicEncryptedPacket> ConstructRstPacket() { |
QuicStreamId stream_id = 5; |
return maker_.MakeRstPacket( |
- 1, true, stream_id, |
+ 1, |
+ true, |
+ stream_id, |
AdjustErrorForVersion(QUIC_RST_FLOW_CONTROL_ACCOUNTING, GetParam())); |
} |
@@ -190,7 +197,8 @@ class QuicStreamFactoryTest : public ::testing::TestWithParam<QuicVersion> { |
TestCompletionCallback callback_; |
}; |
-INSTANTIATE_TEST_CASE_P(Version, QuicStreamFactoryTest, |
+INSTANTIATE_TEST_CASE_P(Version, |
+ QuicStreamFactoryTest, |
::testing::ValuesIn(QuicSupportedVersions())); |
TEST_P(QuicStreamFactoryTest, CreateIfSessionExists) { |
@@ -199,7 +207,7 @@ TEST_P(QuicStreamFactoryTest, CreateIfSessionExists) { |
TEST_P(QuicStreamFactoryTest, Create) { |
MockRead reads[] = { |
- MockRead(ASYNC, OK, 0) // EOF |
+ MockRead(ASYNC, OK, 0) // EOF |
}; |
DeterministicSocketData socket_data(reads, arraysize(reads), NULL, 0); |
socket_factory_.AddSocketDataProvider(&socket_data); |
@@ -233,7 +241,7 @@ TEST_P(QuicStreamFactoryTest, Create) { |
net_log_, |
callback_.callback())); |
stream = request2.ReleaseStream(); // Will reset stream 5. |
- stream.reset(); // Will reset stream 7. |
+ stream.reset(); // Will reset stream 7. |
EXPECT_TRUE(socket_data.at_read_eof()); |
EXPECT_TRUE(socket_data.at_write_eof()); |
@@ -241,7 +249,7 @@ TEST_P(QuicStreamFactoryTest, Create) { |
TEST_P(QuicStreamFactoryTest, CreateZeroRtt) { |
MockRead reads[] = { |
- MockRead(ASYNC, OK, 0) // EOF |
+ MockRead(ASYNC, OK, 0) // EOF |
}; |
DeterministicSocketData socket_data(reads, arraysize(reads), NULL, 0); |
socket_factory_.AddSocketDataProvider(&socket_data); |
@@ -250,8 +258,8 @@ TEST_P(QuicStreamFactoryTest, CreateZeroRtt) { |
crypto_client_stream_factory_.set_handshake_mode( |
MockCryptoClientStream::ZERO_RTT); |
host_resolver_.set_synchronous_mode(true); |
- host_resolver_.rules()->AddIPLiteralRule(host_port_pair_.host(), |
- "192.168.0.1", ""); |
+ host_resolver_.rules()->AddIPLiteralRule( |
+ host_port_pair_.host(), "192.168.0.1", ""); |
QuicStreamRequest request(&factory_); |
EXPECT_EQ(OK, |
@@ -270,7 +278,7 @@ TEST_P(QuicStreamFactoryTest, CreateZeroRtt) { |
TEST_P(QuicStreamFactoryTest, CreateZeroRttPost) { |
MockRead reads[] = { |
- MockRead(ASYNC, OK, 0) // EOF |
+ MockRead(ASYNC, OK, 0) // EOF |
}; |
DeterministicSocketData socket_data(reads, arraysize(reads), NULL, 0); |
socket_factory_.AddSocketDataProvider(&socket_data); |
@@ -279,8 +287,8 @@ TEST_P(QuicStreamFactoryTest, CreateZeroRttPost) { |
crypto_client_stream_factory_.set_handshake_mode( |
MockCryptoClientStream::ZERO_RTT); |
host_resolver_.set_synchronous_mode(true); |
- host_resolver_.rules()->AddIPLiteralRule(host_port_pair_.host(), |
- "192.168.0.1", ""); |
+ host_resolver_.rules()->AddIPLiteralRule( |
+ host_port_pair_.host(), "192.168.0.1", ""); |
QuicStreamRequest request(&factory_); |
// Posts require handshake confirmation, so this will return asynchronously. |
@@ -305,7 +313,7 @@ TEST_P(QuicStreamFactoryTest, CreateZeroRttPost) { |
TEST_P(QuicStreamFactoryTest, CreateHttpVsHttps) { |
MockRead reads[] = { |
- MockRead(ASYNC, OK, 0) // EOF |
+ MockRead(ASYNC, OK, 0) // EOF |
}; |
DeterministicSocketData socket_data1(reads, arraysize(reads), NULL, 0); |
DeterministicSocketData socket_data2(reads, arraysize(reads), NULL, 0); |
@@ -353,7 +361,7 @@ TEST_P(QuicStreamFactoryTest, CreateHttpVsHttps) { |
TEST_P(QuicStreamFactoryTest, Pooling) { |
MockRead reads[] = { |
- MockRead(ASYNC, OK, 0) // EOF |
+ MockRead(ASYNC, OK, 0) // EOF |
}; |
DeterministicSocketData socket_data(reads, arraysize(reads), NULL, 0); |
socket_factory_.AddSocketDataProvider(&socket_data); |
@@ -400,7 +408,7 @@ TEST_P(QuicStreamFactoryTest, Pooling) { |
TEST_P(QuicStreamFactoryTest, NoPoolingAfterGoAway) { |
MockRead reads[] = { |
- MockRead(ASYNC, OK, 0) // EOF |
+ MockRead(ASYNC, OK, 0) // EOF |
}; |
DeterministicSocketData socket_data1(reads, arraysize(reads), NULL, 0); |
DeterministicSocketData socket_data2(reads, arraysize(reads), NULL, 0); |
@@ -443,8 +451,8 @@ TEST_P(QuicStreamFactoryTest, NoPoolingAfterGoAway) { |
&factory_, host_port_pair_, is_https_)); |
EXPECT_FALSE(QuicStreamFactoryPeer::HasActiveSession( |
&factory_, host_port_pair_, is_https_)); |
- EXPECT_FALSE(QuicStreamFactoryPeer::HasActiveSession( |
- &factory_, server2, is_https_)); |
+ EXPECT_FALSE( |
+ QuicStreamFactoryPeer::HasActiveSession(&factory_, server2, is_https_)); |
TestCompletionCallback callback3; |
QuicStreamRequest request3(&factory_); |
@@ -458,8 +466,8 @@ TEST_P(QuicStreamFactoryTest, NoPoolingAfterGoAway) { |
scoped_ptr<QuicHttpStream> stream3 = request3.ReleaseStream(); |
EXPECT_TRUE(stream3.get()); |
- EXPECT_TRUE(QuicStreamFactoryPeer::HasActiveSession( |
- &factory_, server2, is_https_)); |
+ EXPECT_TRUE( |
+ QuicStreamFactoryPeer::HasActiveSession(&factory_, server2, is_https_)); |
EXPECT_TRUE(socket_data1.at_read_eof()); |
EXPECT_TRUE(socket_data1.at_write_eof()); |
@@ -469,7 +477,7 @@ TEST_P(QuicStreamFactoryTest, NoPoolingAfterGoAway) { |
TEST_P(QuicStreamFactoryTest, HttpsPooling) { |
MockRead reads[] = { |
- MockRead(ASYNC, OK, 0) // EOF |
+ MockRead(ASYNC, OK, 0) // EOF |
}; |
DeterministicSocketData socket_data(reads, arraysize(reads), NULL, 0); |
socket_factory_.AddSocketDataProvider(&socket_data); |
@@ -518,10 +526,9 @@ TEST_P(QuicStreamFactoryTest, HttpsPooling) { |
scoped_ptr<QuicHttpStream> stream2 = request2.ReleaseStream(); |
EXPECT_TRUE(stream2.get()); |
- EXPECT_EQ(QuicStreamFactoryPeer::GetActiveSession( |
- &factory_, server1, is_https_), |
- QuicStreamFactoryPeer::GetActiveSession( |
- &factory_, server2, is_https_)); |
+ EXPECT_EQ( |
+ QuicStreamFactoryPeer::GetActiveSession(&factory_, server1, is_https_), |
+ QuicStreamFactoryPeer::GetActiveSession(&factory_, server2, is_https_)); |
EXPECT_TRUE(socket_data.at_read_eof()); |
EXPECT_TRUE(socket_data.at_write_eof()); |
@@ -529,7 +536,7 @@ TEST_P(QuicStreamFactoryTest, HttpsPooling) { |
TEST_P(QuicStreamFactoryTest, NoHttpsPoolingWithCertMismatch) { |
MockRead reads[] = { |
- MockRead(ASYNC, OK, 0) // EOF |
+ MockRead(ASYNC, OK, 0) // EOF |
}; |
DeterministicSocketData socket_data1(reads, arraysize(reads), NULL, 0); |
DeterministicSocketData socket_data2(reads, arraysize(reads), NULL, 0); |
@@ -554,7 +561,6 @@ TEST_P(QuicStreamFactoryTest, NoHttpsPoolingWithCertMismatch) { |
verify_details.cert_verify_result.verified_cert = test_cert; |
crypto_client_stream_factory_.set_proof_verify_details(&verify_details); |
- |
host_resolver_.set_synchronous_mode(true); |
host_resolver_.rules()->AddIPLiteralRule(server1.host(), "192.168.0.1", ""); |
host_resolver_.rules()->AddIPLiteralRule(server2.host(), "192.168.0.1", ""); |
@@ -583,10 +589,9 @@ TEST_P(QuicStreamFactoryTest, NoHttpsPoolingWithCertMismatch) { |
scoped_ptr<QuicHttpStream> stream2 = request2.ReleaseStream(); |
EXPECT_TRUE(stream2.get()); |
- EXPECT_NE(QuicStreamFactoryPeer::GetActiveSession( |
- &factory_, server1, is_https_), |
- QuicStreamFactoryPeer::GetActiveSession( |
- &factory_, server2, is_https_)); |
+ EXPECT_NE( |
+ QuicStreamFactoryPeer::GetActiveSession(&factory_, server1, is_https_), |
+ QuicStreamFactoryPeer::GetActiveSession(&factory_, server2, is_https_)); |
EXPECT_TRUE(socket_data1.at_read_eof()); |
EXPECT_TRUE(socket_data1.at_write_eof()); |
@@ -596,7 +601,7 @@ TEST_P(QuicStreamFactoryTest, NoHttpsPoolingWithCertMismatch) { |
TEST_P(QuicStreamFactoryTest, Goaway) { |
MockRead reads[] = { |
- MockRead(ASYNC, OK, 0) // EOF |
+ MockRead(ASYNC, OK, 0) // EOF |
}; |
DeterministicSocketData socket_data(reads, arraysize(reads), NULL, 0); |
socket_data.StopAfter(1); |
@@ -642,9 +647,8 @@ TEST_P(QuicStreamFactoryTest, Goaway) { |
scoped_ptr<QuicHttpStream> stream2 = request2.ReleaseStream(); |
EXPECT_TRUE(stream2.get()); |
- EXPECT_TRUE(QuicStreamFactoryPeer::HasActiveSession(&factory_, |
- host_port_pair_, |
- is_https_)); |
+ EXPECT_TRUE(QuicStreamFactoryPeer::HasActiveSession( |
+ &factory_, host_port_pair_, is_https_)); |
EXPECT_NE(session, |
QuicStreamFactoryPeer::GetActiveSession( |
&factory_, host_port_pair_, is_https_)); |
@@ -661,16 +665,16 @@ TEST_P(QuicStreamFactoryTest, Goaway) { |
TEST_P(QuicStreamFactoryTest, MaxOpenStream) { |
MockRead reads[] = { |
- MockRead(ASYNC, OK, 0) // EOF |
+ MockRead(ASYNC, OK, 0) // EOF |
}; |
QuicStreamId stream_id = 5; |
scoped_ptr<QuicEncryptedPacket> rst( |
maker_.MakeRstPacket(1, true, stream_id, QUIC_STREAM_CANCELLED)); |
MockWrite writes[] = { |
- MockWrite(ASYNC, rst->data(), rst->length(), 1), |
+ MockWrite(ASYNC, rst->data(), rst->length(), 1), |
}; |
- DeterministicSocketData socket_data(reads, arraysize(reads), |
- writes, arraysize(writes)); |
+ DeterministicSocketData socket_data( |
+ reads, arraysize(reads), writes, arraysize(writes)); |
socket_factory_.AddSocketDataProvider(&socket_data); |
socket_data.StopAfter(1); |
@@ -694,8 +698,10 @@ TEST_P(QuicStreamFactoryTest, MaxOpenStream) { |
} |
scoped_ptr<QuicHttpStream> stream = request.ReleaseStream(); |
EXPECT_TRUE(stream); |
- EXPECT_EQ(OK, stream->InitializeStream( |
- &request_info, DEFAULT_PRIORITY, net_log_, CompletionCallback())); |
+ EXPECT_EQ( |
+ OK, |
+ stream->InitializeStream( |
+ &request_info, DEFAULT_PRIORITY, net_log_, CompletionCallback())); |
streams.push_back(stream.release()); |
} |
@@ -709,8 +715,10 @@ TEST_P(QuicStreamFactoryTest, MaxOpenStream) { |
CompletionCallback())); |
scoped_ptr<QuicHttpStream> stream = request.ReleaseStream(); |
EXPECT_TRUE(stream); |
- EXPECT_EQ(ERR_IO_PENDING, stream->InitializeStream( |
- &request_info, DEFAULT_PRIORITY, net_log_, callback_.callback())); |
+ EXPECT_EQ( |
+ ERR_IO_PENDING, |
+ stream->InitializeStream( |
+ &request_info, DEFAULT_PRIORITY, net_log_, callback_.callback())); |
// Close the first stream. |
streams.front()->Close(false); |
@@ -769,7 +777,7 @@ TEST_P(QuicStreamFactoryTest, ConnectErrorInCreate) { |
TEST_P(QuicStreamFactoryTest, CancelCreate) { |
MockRead reads[] = { |
- MockRead(ASYNC, OK, 0) // EOF |
+ MockRead(ASYNC, OK, 0) // EOF |
}; |
DeterministicSocketData socket_data(reads, arraysize(reads), NULL, 0); |
socket_factory_.AddSocketDataProvider(&socket_data); |
@@ -813,8 +821,7 @@ TEST_P(QuicStreamFactoryTest, CreateConsistentEphemeralPort) { |
TEST_P(QuicStreamFactoryTest, GoAwayDisablesConsistentEphemeralPort) { |
// Get a session to the host using the port suggester. |
- int original_port = |
- GetSourcePortForNewSessionAndGoAway(host_port_pair_); |
+ int original_port = GetSourcePortForNewSessionAndGoAway(host_port_pair_); |
// Verify that the port is different after the goaway. |
EXPECT_NE(original_port, GetSourcePortForNewSession(host_port_pair_)); |
// Since the previous session did not goaway we should see the original port. |
@@ -823,19 +830,20 @@ TEST_P(QuicStreamFactoryTest, GoAwayDisablesConsistentEphemeralPort) { |
TEST_P(QuicStreamFactoryTest, CloseAllSessions) { |
MockRead reads[] = { |
- MockRead(ASYNC, 0, 0) // EOF |
+ MockRead(ASYNC, 0, 0) // EOF |
}; |
scoped_ptr<QuicEncryptedPacket> rst(ConstructRstPacket()); |
std::vector<MockWrite> writes; |
writes.push_back(MockWrite(ASYNC, rst->data(), rst->length(), 1)); |
- DeterministicSocketData socket_data(reads, arraysize(reads), |
- writes.empty() ? NULL : &writes[0], |
+ DeterministicSocketData socket_data(reads, |
+ arraysize(reads), |
+ writes.empty() ? NULL : &writes[0], |
writes.size()); |
socket_factory_.AddSocketDataProvider(&socket_data); |
socket_data.StopAfter(1); |
MockRead reads2[] = { |
- MockRead(ASYNC, 0, 0) // EOF |
+ MockRead(ASYNC, 0, 0) // EOF |
}; |
DeterministicSocketData socket_data2(reads2, arraysize(reads2), NULL, 0); |
socket_factory_.AddSocketDataProvider(&socket_data2); |
@@ -853,9 +861,10 @@ TEST_P(QuicStreamFactoryTest, CloseAllSessions) { |
EXPECT_EQ(OK, callback_.WaitForResult()); |
scoped_ptr<QuicHttpStream> stream = request.ReleaseStream(); |
HttpRequestInfo request_info; |
- EXPECT_EQ(OK, stream->InitializeStream(&request_info, |
- DEFAULT_PRIORITY, |
- net_log_, CompletionCallback())); |
+ EXPECT_EQ( |
+ OK, |
+ stream->InitializeStream( |
+ &request_info, DEFAULT_PRIORITY, net_log_, CompletionCallback())); |
// Close the session and verify that stream saw the error. |
factory_.CloseAllSessions(ERR_INTERNET_DISCONNECTED); |
@@ -886,19 +895,20 @@ TEST_P(QuicStreamFactoryTest, CloseAllSessions) { |
TEST_P(QuicStreamFactoryTest, OnIPAddressChanged) { |
MockRead reads[] = { |
- MockRead(ASYNC, 0, 0) // EOF |
+ MockRead(ASYNC, 0, 0) // EOF |
}; |
scoped_ptr<QuicEncryptedPacket> rst(ConstructRstPacket()); |
std::vector<MockWrite> writes; |
writes.push_back(MockWrite(ASYNC, rst->data(), rst->length(), 1)); |
- DeterministicSocketData socket_data(reads, arraysize(reads), |
- writes.empty() ? NULL : &writes[0], |
+ DeterministicSocketData socket_data(reads, |
+ arraysize(reads), |
+ writes.empty() ? NULL : &writes[0], |
writes.size()); |
socket_factory_.AddSocketDataProvider(&socket_data); |
socket_data.StopAfter(1); |
MockRead reads2[] = { |
- MockRead(ASYNC, 0, 0) // EOF |
+ MockRead(ASYNC, 0, 0) // EOF |
}; |
DeterministicSocketData socket_data2(reads2, arraysize(reads2), NULL, 0); |
socket_factory_.AddSocketDataProvider(&socket_data2); |
@@ -916,9 +926,10 @@ TEST_P(QuicStreamFactoryTest, OnIPAddressChanged) { |
EXPECT_EQ(OK, callback_.WaitForResult()); |
scoped_ptr<QuicHttpStream> stream = request.ReleaseStream(); |
HttpRequestInfo request_info; |
- EXPECT_EQ(OK, stream->InitializeStream(&request_info, |
- DEFAULT_PRIORITY, |
- net_log_, CompletionCallback())); |
+ EXPECT_EQ( |
+ OK, |
+ stream->InitializeStream( |
+ &request_info, DEFAULT_PRIORITY, net_log_, CompletionCallback())); |
// Change the IP address and verify that stream saw the error. |
factory_.OnIPAddressChanged(); |
@@ -950,19 +961,20 @@ TEST_P(QuicStreamFactoryTest, OnIPAddressChanged) { |
TEST_P(QuicStreamFactoryTest, OnCertAdded) { |
MockRead reads[] = { |
- MockRead(ASYNC, 0, 0) // EOF |
+ MockRead(ASYNC, 0, 0) // EOF |
}; |
scoped_ptr<QuicEncryptedPacket> rst(ConstructRstPacket()); |
std::vector<MockWrite> writes; |
writes.push_back(MockWrite(ASYNC, rst->data(), rst->length(), 1)); |
- DeterministicSocketData socket_data(reads, arraysize(reads), |
- writes.empty() ? NULL : &writes[0], |
+ DeterministicSocketData socket_data(reads, |
+ arraysize(reads), |
+ writes.empty() ? NULL : &writes[0], |
writes.size()); |
socket_factory_.AddSocketDataProvider(&socket_data); |
socket_data.StopAfter(1); |
MockRead reads2[] = { |
- MockRead(ASYNC, 0, 0) // EOF |
+ MockRead(ASYNC, 0, 0) // EOF |
}; |
DeterministicSocketData socket_data2(reads2, arraysize(reads2), NULL, 0); |
socket_factory_.AddSocketDataProvider(&socket_data2); |
@@ -980,9 +992,10 @@ TEST_P(QuicStreamFactoryTest, OnCertAdded) { |
EXPECT_EQ(OK, callback_.WaitForResult()); |
scoped_ptr<QuicHttpStream> stream = request.ReleaseStream(); |
HttpRequestInfo request_info; |
- EXPECT_EQ(OK, stream->InitializeStream(&request_info, |
- DEFAULT_PRIORITY, |
- net_log_, CompletionCallback())); |
+ EXPECT_EQ( |
+ OK, |
+ stream->InitializeStream( |
+ &request_info, DEFAULT_PRIORITY, net_log_, CompletionCallback())); |
// Add a cert and verify that stream saw the event. |
factory_.OnCertAdded(NULL); |
@@ -1014,19 +1027,20 @@ TEST_P(QuicStreamFactoryTest, OnCertAdded) { |
TEST_P(QuicStreamFactoryTest, OnCACertChanged) { |
MockRead reads[] = { |
- MockRead(ASYNC, 0, 0) // EOF |
+ MockRead(ASYNC, 0, 0) // EOF |
}; |
scoped_ptr<QuicEncryptedPacket> rst(ConstructRstPacket()); |
std::vector<MockWrite> writes; |
writes.push_back(MockWrite(ASYNC, rst->data(), rst->length(), 1)); |
- DeterministicSocketData socket_data(reads, arraysize(reads), |
- writes.empty() ? NULL : &writes[0], |
+ DeterministicSocketData socket_data(reads, |
+ arraysize(reads), |
+ writes.empty() ? NULL : &writes[0], |
writes.size()); |
socket_factory_.AddSocketDataProvider(&socket_data); |
socket_data.StopAfter(1); |
MockRead reads2[] = { |
- MockRead(ASYNC, 0, 0) // EOF |
+ MockRead(ASYNC, 0, 0) // EOF |
}; |
DeterministicSocketData socket_data2(reads2, arraysize(reads2), NULL, 0); |
socket_factory_.AddSocketDataProvider(&socket_data2); |
@@ -1044,9 +1058,10 @@ TEST_P(QuicStreamFactoryTest, OnCACertChanged) { |
EXPECT_EQ(OK, callback_.WaitForResult()); |
scoped_ptr<QuicHttpStream> stream = request.ReleaseStream(); |
HttpRequestInfo request_info; |
- EXPECT_EQ(OK, stream->InitializeStream(&request_info, |
- DEFAULT_PRIORITY, |
- net_log_, CompletionCallback())); |
+ EXPECT_EQ( |
+ OK, |
+ stream->InitializeStream( |
+ &request_info, DEFAULT_PRIORITY, net_log_, CompletionCallback())); |
// Change the CA cert and verify that stream saw the event. |
factory_.OnCACertChanged(NULL); |