| Index: net/quic/crypto/quic_crypto_client_config_test.cc
|
| diff --git a/net/quic/crypto/quic_crypto_client_config_test.cc b/net/quic/crypto/quic_crypto_client_config_test.cc
|
| index 92b1b0eb3374d055da8f737dc6270802dadcf89e..2b9ec37e109c46318e7805791ba5b6c20f0c88fd 100644
|
| --- a/net/quic/crypto/quic_crypto_client_config_test.cc
|
| +++ b/net/quic/crypto/quic_crypto_client_config_test.cc
|
| @@ -59,8 +59,8 @@ TEST(QuicCryptoClientConfigTest, InchoateChlo) {
|
| QuicCryptoNegotiatedParameters params;
|
| CryptoHandshakeMessage msg;
|
| QuicServerId server_id("www.google.com", 80, false, PRIVACY_MODE_DISABLED);
|
| - config.FillInchoateClientHello(server_id, QuicVersionMax(), &state,
|
| - ¶ms, &msg);
|
| + config.FillInchoateClientHello(
|
| + server_id, QuicVersionMax(), &state, ¶ms, &msg);
|
|
|
| QuicTag cver;
|
| EXPECT_EQ(QUIC_NO_ERROR, msg.GetUint32(kVER, &cver));
|
| @@ -82,8 +82,8 @@ TEST(QuicCryptoClientConfigTest, InchoateChloSecure) {
|
| QuicCryptoNegotiatedParameters params;
|
| CryptoHandshakeMessage msg;
|
| QuicServerId server_id("www.google.com", 443, true, PRIVACY_MODE_DISABLED);
|
| - config.FillInchoateClientHello(server_id, QuicVersionMax(), &state,
|
| - ¶ms, &msg);
|
| + config.FillInchoateClientHello(
|
| + server_id, QuicVersionMax(), &state, ¶ms, &msg);
|
|
|
| QuicTag pdmd;
|
| EXPECT_EQ(QUIC_NO_ERROR, msg.GetUint32(kPDMD, &pdmd));
|
| @@ -97,8 +97,8 @@ TEST(QuicCryptoClientConfigTest, InchoateChloSecureNoEcdsa) {
|
| QuicCryptoNegotiatedParameters params;
|
| CryptoHandshakeMessage msg;
|
| QuicServerId server_id("www.google.com", 443, true, PRIVACY_MODE_DISABLED);
|
| - config.FillInchoateClientHello(server_id, QuicVersionMax(), &state,
|
| - ¶ms, &msg);
|
| + config.FillInchoateClientHello(
|
| + server_id, QuicVersionMax(), &state, ¶ms, &msg);
|
|
|
| QuicTag pdmd;
|
| EXPECT_EQ(QUIC_NO_ERROR, msg.GetUint32(kPDMD, &pdmd));
|
| @@ -156,23 +156,23 @@ TEST(QuicCryptoClientConfigTest, ProcessServerDowngradeAttack) {
|
| string error;
|
| QuicCryptoClientConfig config;
|
| EXPECT_EQ(QUIC_VERSION_NEGOTIATION_MISMATCH,
|
| - config.ProcessServerHello(msg, 0, supported_versions,
|
| - &cached, &out_params, &error));
|
| + config.ProcessServerHello(
|
| + msg, 0, supported_versions, &cached, &out_params, &error));
|
| EXPECT_EQ("Downgrade attack detected", error);
|
| }
|
|
|
| TEST(QuicCryptoClientConfigTest, InitializeFrom) {
|
| QuicCryptoClientConfig config;
|
| - QuicServerId canonical_server_id("www.google.com", 80, false,
|
| - PRIVACY_MODE_DISABLED);
|
| + QuicServerId canonical_server_id(
|
| + "www.google.com", 80, false, PRIVACY_MODE_DISABLED);
|
| QuicCryptoClientConfig::CachedState* state =
|
| config.LookupOrCreate(canonical_server_id);
|
| // TODO(rch): Populate other fields of |state|.
|
| state->set_source_address_token("TOKEN");
|
| state->SetProofValid();
|
|
|
| - QuicServerId other_server_id("mail.google.com", 80, false,
|
| - PRIVACY_MODE_DISABLED);
|
| + QuicServerId other_server_id(
|
| + "mail.google.com", 80, false, PRIVACY_MODE_DISABLED);
|
| config.InitializeFrom(other_server_id, canonical_server_id, &config);
|
| QuicCryptoClientConfig::CachedState* other =
|
| config.LookupOrCreate(other_server_id);
|
| @@ -186,10 +186,10 @@ TEST(QuicCryptoClientConfigTest, InitializeFrom) {
|
| TEST(QuicCryptoClientConfigTest, Canonical) {
|
| QuicCryptoClientConfig config;
|
| config.AddCanonicalSuffix(".google.com");
|
| - QuicServerId canonical_id1("www.google.com", 80, false,
|
| - PRIVACY_MODE_DISABLED);
|
| - QuicServerId canonical_id2("mail.google.com", 80, false,
|
| - PRIVACY_MODE_DISABLED);
|
| + QuicServerId canonical_id1(
|
| + "www.google.com", 80, false, PRIVACY_MODE_DISABLED);
|
| + QuicServerId canonical_id2(
|
| + "mail.google.com", 80, false, PRIVACY_MODE_DISABLED);
|
| QuicCryptoClientConfig::CachedState* state =
|
| config.LookupOrCreate(canonical_id1);
|
| // TODO(rch): Populate other fields of |state|.
|
| @@ -205,18 +205,18 @@ TEST(QuicCryptoClientConfigTest, Canonical) {
|
| EXPECT_EQ(state->certs(), other->certs());
|
| EXPECT_EQ(1u, other->generation_counter());
|
|
|
| - QuicServerId different_id("mail.google.org", 80, false,
|
| - PRIVACY_MODE_DISABLED);
|
| + QuicServerId different_id(
|
| + "mail.google.org", 80, false, PRIVACY_MODE_DISABLED);
|
| EXPECT_TRUE(config.LookupOrCreate(different_id)->IsEmpty());
|
| }
|
|
|
| TEST(QuicCryptoClientConfigTest, CanonicalNotUsedIfNotValid) {
|
| QuicCryptoClientConfig config;
|
| config.AddCanonicalSuffix(".google.com");
|
| - QuicServerId canonical_id1("www.google.com", 80, false,
|
| - PRIVACY_MODE_DISABLED);
|
| - QuicServerId canonical_id2("mail.google.com", 80, false,
|
| - PRIVACY_MODE_DISABLED);
|
| + QuicServerId canonical_id1(
|
| + "www.google.com", 80, false, PRIVACY_MODE_DISABLED);
|
| + QuicServerId canonical_id2(
|
| + "mail.google.com", 80, false, PRIVACY_MODE_DISABLED);
|
| QuicCryptoClientConfig::CachedState* state =
|
| config.LookupOrCreate(canonical_id1);
|
| // TODO(rch): Populate other fields of |state|.
|
|
|