Index: trunk/src/net/quic/quic_client_session_test.cc |
=================================================================== |
--- trunk/src/net/quic/quic_client_session_test.cc (revision 290383) |
+++ trunk/src/net/quic/quic_client_session_test.cc (working copy) |
@@ -6,14 +6,12 @@ |
#include <vector> |
-#include "base/base64.h" |
#include "base/files/file_path.h" |
#include "base/rand_util.h" |
#include "net/base/capturing_net_log.h" |
#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" |
@@ -26,7 +24,6 @@ |
#include "net/quic/test_tools/quic_test_utils.h" |
#include "net/quic/test_tools/simple_quic_framer.h" |
#include "net/socket/socket_test_util.h" |
-#include "net/spdy/spdy_test_utils.h" |
#include "net/test/cert_test_util.h" |
#include "net/udp/datagram_client_socket.h" |
@@ -76,7 +73,6 @@ |
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), |
@@ -112,7 +108,6 @@ |
CapturingNetLog net_log_; |
MockClientSocketFactory socket_factory_; |
StaticSocketDataProvider socket_data_; |
- TransportSecurityState transport_security_state_; |
QuicClientSession session_; |
MockClock clock_; |
MockRandom random_; |
@@ -177,15 +172,18 @@ |
EXPECT_EQ(NULL, session_.CreateOutgoingDataStream()); |
} |
-TEST_P(QuicClientSessionTest, CanPool) { |
+// TODO(rch): re-enable this. |
+TEST_P(QuicClientSessionTest, DISABLED_CanPool) { |
// Load a cert that is valid for: |
// www.example.org |
// mail.example.org |
// www.example.com |
+ base::FilePath certs_dir = GetTestCertsDirectory(); |
+ CertVerifyResult result; |
ProofVerifyDetailsChromium details; |
details.cert_verify_result.verified_cert = |
- ImportCertFromFile(GetTestCertsDirectory(), "spdy_pooling.pem"); |
+ ImportCertFromFile(certs_dir, "spdy_pooling.pem"); |
ASSERT_TRUE(details.cert_verify_result.verified_cert); |
session_.OnProofVerifyDetailsAvailable(details); |
@@ -198,15 +196,18 @@ |
EXPECT_FALSE(session_.CanPool("mail.google.com")); |
} |
-TEST_P(QuicClientSessionTest, ConnectionPooledWithTlsChannelId) { |
+// TODO(rch): re-enable this. |
+TEST_P(QuicClientSessionTest, DISABLED_ConnectionPooledWithTlsChannelId) { |
// Load a cert that is valid for: |
// www.example.org |
// mail.example.org |
// www.example.com |
+ base::FilePath certs_dir = GetTestCertsDirectory(); |
+ CertVerifyResult result; |
ProofVerifyDetailsChromium details; |
details.cert_verify_result.verified_cert = |
- ImportCertFromFile(GetTestCertsDirectory(), "spdy_pooling.pem"); |
+ ImportCertFromFile(certs_dir, "spdy_pooling.pem"); |
ASSERT_TRUE(details.cert_verify_result.verified_cert); |
session_.OnProofVerifyDetailsAvailable(details); |
@@ -219,51 +220,6 @@ |
EXPECT_FALSE(session_.CanPool("mail.google.com")); |
} |
-TEST_P(QuicClientSessionTest, ConnectionNotPooledWithDifferentPin) { |
- uint8 primary_pin = 1; |
- uint8 backup_pin = 2; |
- uint8 bad_pin = 3; |
- AddPin(&transport_security_state_, "mail.example.org", primary_pin, |
- backup_pin); |
- |
- ProofVerifyDetailsChromium details; |
- details.cert_verify_result.verified_cert = |
- ImportCertFromFile(GetTestCertsDirectory(), "spdy_pooling.pem"); |
- details.cert_verify_result.is_issued_by_known_root = true; |
- details.cert_verify_result.public_key_hashes.push_back( |
- GetTestHashValue(bad_pin)); |
- |
- ASSERT_TRUE(details.cert_verify_result.verified_cert); |
- |
- session_.OnProofVerifyDetailsAvailable(details); |
- CompleteCryptoHandshake(); |
- QuicClientSessionPeer::SetChannelIDSent(&session_, true); |
- |
- EXPECT_FALSE(session_.CanPool("mail.example.org")); |
-} |
- |
-TEST_P(QuicClientSessionTest, ConnectionPooledWithMatchingPin) { |
- uint8 primary_pin = 1; |
- uint8 backup_pin = 2; |
- AddPin(&transport_security_state_, "mail.example.org", primary_pin, |
- backup_pin); |
- |
- ProofVerifyDetailsChromium details; |
- details.cert_verify_result.verified_cert = |
- ImportCertFromFile(GetTestCertsDirectory(), "spdy_pooling.pem"); |
- details.cert_verify_result.is_issued_by_known_root = true; |
- details.cert_verify_result.public_key_hashes.push_back( |
- GetTestHashValue(primary_pin)); |
- |
- ASSERT_TRUE(details.cert_verify_result.verified_cert); |
- |
- session_.OnProofVerifyDetailsAvailable(details); |
- CompleteCryptoHandshake(); |
- QuicClientSessionPeer::SetChannelIDSent(&session_, true); |
- |
- EXPECT_TRUE(session_.CanPool("mail.example.org")); |
-} |
- |
} // namespace |
} // namespace test |
} // namespace net |