Index: net/quic/chromium/quic_stream_factory_test.cc |
diff --git a/net/quic/chromium/quic_stream_factory_test.cc b/net/quic/chromium/quic_stream_factory_test.cc |
index 19d40b5ebd994059e5fdfee3b783a4c8ec476cb8..d6fd5aeb42ec0c74be6e856b963bf382beebf52f 100644 |
--- a/net/quic/chromium/quic_stream_factory_test.cc |
+++ b/net/quic/chromium/quic_stream_factory_test.cc |
@@ -5391,9 +5391,8 @@ TEST_P(QuicStreamFactoryWithDestinationTest, InvalidCertificate) { |
scoped_refptr<X509Certificate> cert( |
ImportCertFromFile(GetTestCertsDirectory(), "wildcard.pem")); |
- bool unused; |
- ASSERT_FALSE(cert->VerifyNameMatch(origin1_.host(), &unused)); |
- ASSERT_TRUE(cert->VerifyNameMatch(origin2_.host(), &unused)); |
+ ASSERT_FALSE(cert->VerifyNameMatch(origin1_.host(), false)); |
+ ASSERT_TRUE(cert->VerifyNameMatch(origin2_.host(), false)); |
ProofVerifyDetailsChromium verify_details; |
verify_details.cert_verify_result.verified_cert = cert; |
@@ -5425,10 +5424,9 @@ TEST_P(QuicStreamFactoryWithDestinationTest, SharedCertificate) { |
scoped_refptr<X509Certificate> cert( |
ImportCertFromFile(GetTestCertsDirectory(), "wildcard.pem")); |
- bool unused; |
- ASSERT_TRUE(cert->VerifyNameMatch(origin1_.host(), &unused)); |
- ASSERT_TRUE(cert->VerifyNameMatch(origin2_.host(), &unused)); |
- ASSERT_FALSE(cert->VerifyNameMatch(kDifferentHostname, &unused)); |
+ ASSERT_TRUE(cert->VerifyNameMatch(origin1_.host(), false)); |
+ ASSERT_TRUE(cert->VerifyNameMatch(origin2_.host(), false)); |
+ ASSERT_FALSE(cert->VerifyNameMatch(kDifferentHostname, false)); |
ProofVerifyDetailsChromium verify_details; |
verify_details.cert_verify_result.verified_cert = cert; |
@@ -5491,10 +5489,9 @@ TEST_P(QuicStreamFactoryWithDestinationTest, DifferentPrivacyMode) { |
scoped_refptr<X509Certificate> cert( |
ImportCertFromFile(GetTestCertsDirectory(), "wildcard.pem")); |
- bool unused; |
- ASSERT_TRUE(cert->VerifyNameMatch(origin1_.host(), &unused)); |
- ASSERT_TRUE(cert->VerifyNameMatch(origin2_.host(), &unused)); |
- ASSERT_FALSE(cert->VerifyNameMatch(kDifferentHostname, &unused)); |
+ ASSERT_TRUE(cert->VerifyNameMatch(origin1_.host(), false)); |
+ ASSERT_TRUE(cert->VerifyNameMatch(origin2_.host(), false)); |
+ ASSERT_FALSE(cert->VerifyNameMatch(kDifferentHostname, false)); |
ProofVerifyDetailsChromium verify_details1; |
verify_details1.cert_verify_result.verified_cert = cert; |
@@ -5572,10 +5569,9 @@ TEST_P(QuicStreamFactoryWithDestinationTest, DisjointCertificate) { |
scoped_refptr<X509Certificate> cert1( |
ImportCertFromFile(GetTestCertsDirectory(), "wildcard.pem")); |
- bool unused; |
- ASSERT_TRUE(cert1->VerifyNameMatch(origin1_.host(), &unused)); |
- ASSERT_FALSE(cert1->VerifyNameMatch(origin2_.host(), &unused)); |
- ASSERT_FALSE(cert1->VerifyNameMatch(kDifferentHostname, &unused)); |
+ ASSERT_TRUE(cert1->VerifyNameMatch(origin1_.host(), false)); |
+ ASSERT_FALSE(cert1->VerifyNameMatch(origin2_.host(), false)); |
+ ASSERT_FALSE(cert1->VerifyNameMatch(kDifferentHostname, false)); |
ProofVerifyDetailsChromium verify_details1; |
verify_details1.cert_verify_result.verified_cert = cert1; |
@@ -5584,8 +5580,8 @@ TEST_P(QuicStreamFactoryWithDestinationTest, DisjointCertificate) { |
scoped_refptr<X509Certificate> cert2( |
ImportCertFromFile(GetTestCertsDirectory(), "spdy_pooling.pem")); |
- ASSERT_TRUE(cert2->VerifyNameMatch(origin2_.host(), &unused)); |
- ASSERT_FALSE(cert2->VerifyNameMatch(kDifferentHostname, &unused)); |
+ ASSERT_TRUE(cert2->VerifyNameMatch(origin2_.host(), false)); |
+ ASSERT_FALSE(cert2->VerifyNameMatch(kDifferentHostname, false)); |
ProofVerifyDetailsChromium verify_details2; |
verify_details2.cert_verify_result.verified_cert = cert2; |