summaryrefslogtreecommitdiffstats
path: root/net/quic/quic_stream_factory_test.cc
diff options
context:
space:
mode:
authorrch@chromium.org <rch@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-18 17:10:13 +0000
committerrch@chromium.org <rch@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-18 17:10:13 +0000
commitb694e48c1586921885227ef3ad9ac79692f565c9 (patch)
tree454bc2310b5008a2b4f79de50d525d49a22cdc89 /net/quic/quic_stream_factory_test.cc
parent0229235e3f8734f9cae48748529f68ccbf1d289c (diff)
downloadchromium_src-b694e48c1586921885227ef3ad9ac79692f565c9.zip
chromium_src-b694e48c1586921885227ef3ad9ac79692f565c9.tar.gz
chromium_src-b694e48c1586921885227ef3ad9ac79692f565c9.tar.bz2
Move all Chrome-specific logic out of QuicCryptoClientStream
and into QuicClientSession (which is Chrome-specific). Review URL: https://codereview.chromium.org/197873011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@257667 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/quic/quic_stream_factory_test.cc')
-rw-r--r--net/quic/quic_stream_factory_test.cc14
1 files changed, 8 insertions, 6 deletions
diff --git a/net/quic/quic_stream_factory_test.cc b/net/quic/quic_stream_factory_test.cc
index 62dc868..f7e271c 100644
--- a/net/quic/quic_stream_factory_test.cc
+++ b/net/quic/quic_stream_factory_test.cc
@@ -13,6 +13,7 @@
#include "net/http/http_response_info.h"
#include "net/http/http_util.h"
#include "net/quic/crypto/crypto_handshake.h"
+#include "net/quic/crypto/proof_verifier_chromium.h"
#include "net/quic/crypto/quic_decrypter.h"
#include "net/quic/crypto/quic_encrypter.h"
#include "net/quic/quic_http_stream.h"
@@ -420,9 +421,9 @@ TEST_P(QuicStreamFactoryTest, HttpsPooling) {
scoped_refptr<X509Certificate> test_cert(
ImportCertFromFile(certs_dir, "spdy_pooling.pem"));
ASSERT_NE(static_cast<X509Certificate*>(NULL), test_cert);
- SSLInfo ssl_info;
- ssl_info.cert = test_cert.get();
- crypto_client_stream_factory_.set_ssl_info(&ssl_info);
+ ProofVerifyDetailsChromium verify_details;
+ verify_details.cert_verify_result.verified_cert = test_cert;
+ crypto_client_stream_factory_.set_proof_verify_details(&verify_details);
host_resolver_.set_synchronous_mode(true);
host_resolver_.rules()->AddIPLiteralRule(server1.host(), "192.168.0.1", "");
@@ -484,9 +485,10 @@ TEST_P(QuicStreamFactoryTest, NoHttpsPoolingWithCertMismatch) {
scoped_refptr<X509Certificate> test_cert(
ImportCertFromFile(certs_dir, "spdy_pooling.pem"));
ASSERT_NE(static_cast<X509Certificate*>(NULL), test_cert);
- SSLInfo ssl_info;
- ssl_info.cert = test_cert.get();
- crypto_client_stream_factory_.set_ssl_info(&ssl_info);
+ ProofVerifyDetailsChromium verify_details;
+ verify_details.cert_verify_result.verified_cert = test_cert;
+ crypto_client_stream_factory_.set_proof_verify_details(&verify_details);
+
host_resolver_.set_synchronous_mode(true);
host_resolver_.rules()->AddIPLiteralRule(server1.host(), "192.168.0.1", "");