Index: net/quic/quic_client_session_test.cc |
diff --git a/net/quic/quic_client_session_test.cc b/net/quic/quic_client_session_test.cc |
index 9e556028df17d30a35ec62ed252d8a40bb0d76c0..2e27491387f3d37680bc026973ab2d9543fe1603 100644 |
--- a/net/quic/quic_client_session_test.cc |
+++ b/net/quic/quic_client_session_test.cc |
@@ -33,14 +33,13 @@ const uint16 kServerPort = 80; |
class TestPacketWriter : public QuicDefaultPacketWriter { |
public: |
- TestPacketWriter(QuicVersion version) : version_(version) { |
- } |
+ TestPacketWriter(QuicVersion version) : version_(version) {} |
// QuicPacketWriter |
- virtual WriteResult WritePacket( |
- const char* buffer, size_t buf_len, |
- const IPAddressNumber& self_address, |
- const IPEndPoint& peer_address) OVERRIDE { |
+ virtual WriteResult WritePacket(const char* buffer, |
+ size_t buf_len, |
+ const IPAddressNumber& self_address, |
+ const IPEndPoint& peer_address) OVERRIDE { |
SimpleQuicFramer framer(SupportedVersions(version_)); |
QuicEncryptedPacket packet(buffer, buf_len); |
EXPECT_TRUE(framer.ProcessPacket(packet)); |
@@ -68,11 +67,19 @@ class QuicClientSessionTest : public ::testing::TestWithParam<QuicVersion> { |
: writer_(new TestPacketWriter(GetParam())), |
connection_( |
new PacketSavingConnection(false, SupportedVersions(GetParam()))), |
- session_(connection_, GetSocket().Pass(), writer_.Pass(), NULL, NULL, |
+ session_(connection_, |
+ GetSocket().Pass(), |
+ writer_.Pass(), |
+ NULL, |
+ NULL, |
make_scoped_ptr((QuicServerInfo*)NULL), |
- QuicServerId(kServerHostname, kServerPort, false, |
+ QuicServerId(kServerHostname, |
+ kServerPort, |
+ false, |
PRIVACY_MODE_DISABLED), |
- DefaultQuicConfig(), &crypto_config_, &net_log_) { |
+ DefaultQuicConfig(), |
+ &crypto_config_, |
+ &net_log_) { |
session_.config()->SetDefaults(); |
crypto_config_.SetDefaults(); |
} |
@@ -84,15 +91,17 @@ class QuicClientSessionTest : public ::testing::TestWithParam<QuicVersion> { |
scoped_ptr<DatagramClientSocket> GetSocket() { |
socket_factory_.AddSocketDataProvider(&socket_data_); |
return socket_factory_.CreateDatagramClientSocket( |
- DatagramSocket::DEFAULT_BIND, base::Bind(&base::RandInt), |
- &net_log_, NetLog::Source()); |
+ DatagramSocket::DEFAULT_BIND, |
+ base::Bind(&base::RandInt), |
+ &net_log_, |
+ NetLog::Source()); |
} |
void CompleteCryptoHandshake() { |
ASSERT_EQ(ERR_IO_PENDING, |
session_.CryptoConnect(false, callback_.callback())); |
- CryptoTestUtils::HandshakeWithFakeServer( |
- connection_, session_.GetCryptoStream()); |
+ CryptoTestUtils::HandshakeWithFakeServer(connection_, |
+ session_.GetCryptoStream()); |
ASSERT_EQ(OK, callback_.WaitForResult()); |
} |
@@ -109,7 +118,8 @@ class QuicClientSessionTest : public ::testing::TestWithParam<QuicVersion> { |
QuicCryptoClientConfig crypto_config_; |
}; |
-INSTANTIATE_TEST_CASE_P(Tests, QuicClientSessionTest, |
+INSTANTIATE_TEST_CASE_P(Tests, |
+ QuicClientSessionTest, |
::testing::ValuesIn(QuicSupportedVersions())); |
TEST_P(QuicClientSessionTest, CryptoConnect) { |
@@ -146,8 +156,8 @@ TEST_P(QuicClientSessionTest, MaxNumStreamsViaRequest) { |
QuicClientSession::StreamRequest stream_request; |
TestCompletionCallback callback; |
ASSERT_EQ(ERR_IO_PENDING, |
- stream_request.StartRequest(session_.GetWeakPtr(), &stream, |
- callback.callback())); |
+ stream_request.StartRequest( |
+ session_.GetWeakPtr(), &stream, callback.callback())); |
// Close a stream and ensure I can now open a new one. |
session_.CloseStream(streams[0]->id()); |