Index: net/quic/quic_crypto_server_stream_test.cc |
diff --git a/net/quic/quic_crypto_server_stream_test.cc b/net/quic/quic_crypto_server_stream_test.cc |
index 800c245a0c484ba1e44c417c03aa0679bb39492d..0e378c14d15273acd95db1155750ed86f34f96ac 100644 |
--- a/net/quic/quic_crypto_server_stream_test.cc |
+++ b/net/quic/quic_crypto_server_stream_test.cc |
@@ -72,8 +72,10 @@ class QuicCryptoServerStreamTest : public ::testing::TestWithParam<bool> { |
crypto_config_.set_strike_register_no_startup_period(); |
CryptoTestUtils::SetupCryptoServerConfigForTest( |
- connection_->clock(), connection_->random_generator(), |
- session_.config(), &crypto_config_); |
+ connection_->clock(), |
+ connection_->random_generator(), |
+ session_.config(), |
+ &crypto_config_); |
if (AsyncStrikeRegisterVerification()) { |
string orbit = |
@@ -82,16 +84,14 @@ class QuicCryptoServerStreamTest : public ::testing::TestWithParam<bool> { |
10000, // strike_register_max_entries |
static_cast<uint32>(connection_->clock()->WallNow().ToUNIXSeconds()), |
60, // strike_register_window_secs |
- reinterpret_cast<const uint8 *>(orbit.data()), |
+ reinterpret_cast<const uint8*>(orbit.data()), |
StrikeRegister::NO_STARTUP_PERIOD_NEEDED); |
strike_register_client_->StartDelayingVerification(); |
crypto_config_.SetStrikeRegisterClient(strike_register_client_); |
} |
} |
- bool AsyncStrikeRegisterVerification() { |
- return GetParam(); |
- } |
+ bool AsyncStrikeRegisterVerification() { return GetParam(); } |
void ConstructHandshakeMessage() { |
CryptoFramer framer; |
@@ -99,8 +99,8 @@ class QuicCryptoServerStreamTest : public ::testing::TestWithParam<bool> { |
} |
int CompleteCryptoHandshake() { |
- return CryptoTestUtils::HandshakeWithFakeClient(connection_, &stream_, |
- client_options_); |
+ return CryptoTestUtils::HandshakeWithFakeClient( |
+ connection_, &stream_, client_options_); |
} |
protected: |
@@ -145,8 +145,8 @@ TEST_P(QuicCryptoServerStreamTest, ZeroRTT) { |
QuicCryptoClientConfig client_crypto_config; |
client_crypto_config.SetDefaults(); |
- QuicServerId server_id(kServerHostname, kServerPort, false, |
- PRIVACY_MODE_DISABLED); |
+ QuicServerId server_id( |
+ kServerHostname, kServerPort, false, PRIVACY_MODE_DISABLED); |
scoped_ptr<QuicCryptoClientStream> client(new QuicCryptoClientStream( |
server_id, client_session.get(), NULL, &client_crypto_config)); |
client_session->SetCryptoStream(client.get()); |
@@ -184,8 +184,8 @@ TEST_P(QuicCryptoServerStreamTest, ZeroRTT) { |
server_id, client_session.get(), NULL, &client_crypto_config)); |
client_session->SetCryptoStream(client.get()); |
- server.reset(new QuicCryptoServerStream(crypto_config_, |
- server_session.get())); |
+ server.reset( |
+ new QuicCryptoServerStream(crypto_config_, server_session.get())); |
server_session->SetCryptoStream(server.get()); |
CHECK(client->CryptoConnect()); |
@@ -209,9 +209,12 @@ TEST_P(QuicCryptoServerStreamTest, ZeroRTT) { |
EXPECT_FALSE(client->handshake_confirmed()); |
EXPECT_TRUE(server->handshake_confirmed()); |
- messages_moved = CryptoTestUtils::AdvanceHandshake( |
- client_conn, client.get(), messages_moved.first, |
- server_conn, server.get(), messages_moved.second); |
+ messages_moved = CryptoTestUtils::AdvanceHandshake(client_conn, |
+ client.get(), |
+ messages_moved.first, |
+ server_conn, |
+ server.get(), |
+ messages_moved.second); |
EXPECT_EQ(1u, messages_moved.first); |
EXPECT_EQ(1u, messages_moved.second); |
EXPECT_TRUE(client->handshake_confirmed()); |
@@ -226,8 +229,9 @@ TEST_P(QuicCryptoServerStreamTest, ZeroRTT) { |
TEST_P(QuicCryptoServerStreamTest, MessageAfterHandshake) { |
CompleteCryptoHandshake(); |
- EXPECT_CALL(*connection_, SendConnectionClose( |
- QUIC_CRYPTO_MESSAGE_AFTER_HANDSHAKE_COMPLETE)); |
+ EXPECT_CALL( |
+ *connection_, |
+ SendConnectionClose(QUIC_CRYPTO_MESSAGE_AFTER_HANDSHAKE_COMPLETE)); |
message_.set_tag(kCHLO); |
ConstructHandshakeMessage(); |
stream_.ProcessRawData(message_data_->data(), message_data_->length()); |
@@ -236,8 +240,8 @@ TEST_P(QuicCryptoServerStreamTest, MessageAfterHandshake) { |
TEST_P(QuicCryptoServerStreamTest, BadMessageType) { |
message_.set_tag(kSHLO); |
ConstructHandshakeMessage(); |
- EXPECT_CALL(*connection_, SendConnectionClose( |
- QUIC_INVALID_CRYPTO_MESSAGE_TYPE)); |
+ EXPECT_CALL(*connection_, |
+ SendConnectionClose(QUIC_INVALID_CRYPTO_MESSAGE_TYPE)); |
stream_.ProcessRawData(message_data_->data(), message_data_->length()); |
} |