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 ae1aea6e9a6712f4a74a473237d38d9782549ea4..7b88d289ee39add8f5b1ce2fd8f8644b785abcfd 100644 |
--- a/net/quic/quic_client_session_test.cc |
+++ b/net/quic/quic_client_session_test.cc |
@@ -12,6 +12,7 @@ |
#include "net/base/test_completion_callback.h" |
#include "net/base/test_data_directory.h" |
#include "net/cert/cert_verify_result.h" |
+#include "net/http/transport_security_state.h" |
#include "net/quic/crypto/aes_128_gcm_12_encrypter.h" |
#include "net/quic/crypto/crypto_protocol.h" |
#include "net/quic/crypto/proof_verifier_chromium.h" |
@@ -73,6 +74,7 @@ class QuicClientSessionTest : public ::testing::TestWithParam<QuicVersion> { |
connection_( |
new PacketSavingConnection(false, SupportedVersions(GetParam()))), |
session_(connection_, GetSocket().Pass(), writer_.Pass(), NULL, NULL, |
+ &transport_security_state_, |
make_scoped_ptr((QuicServerInfo*)NULL), |
QuicServerId(kServerHostname, kServerPort, false, |
PRIVACY_MODE_DISABLED), |
@@ -108,6 +110,7 @@ class QuicClientSessionTest : public ::testing::TestWithParam<QuicVersion> { |
CapturingNetLog net_log_; |
MockClientSocketFactory socket_factory_; |
StaticSocketDataProvider socket_data_; |
+ TransportSecurityState transport_security_state_; |
QuicClientSession session_; |
MockClock clock_; |
MockRandom random_; |
@@ -172,8 +175,7 @@ TEST_P(QuicClientSessionTest, GoAwayReceived) { |
EXPECT_EQ(NULL, session_.CreateOutgoingDataStream()); |
} |
-// TODO(rch): re-enable this. |
-TEST_P(QuicClientSessionTest, DISABLED_CanPool) { |
+TEST_P(QuicClientSessionTest, CanPool) { |
// Load a cert that is valid for: |
// www.example.org |
// mail.example.org |
@@ -196,8 +198,7 @@ TEST_P(QuicClientSessionTest, DISABLED_CanPool) { |
EXPECT_FALSE(session_.CanPool("mail.google.com")); |
} |
-// TODO(rch): re-enable this. |
-TEST_P(QuicClientSessionTest, DISABLED_ConnectionPooledWithTlsChannelId) { |
+TEST_P(QuicClientSessionTest, ConnectionPooledWithTlsChannelId) { |
Ryan Sleevi
2014/08/07 18:49:29
Pinning tests
Ryan Hamilton
2014/08/08 19:27:43
I would have thought that the new tests written as
|
// Load a cert that is valid for: |
// www.example.org |
// mail.example.org |