Index: net/cert/multi_threaded_cert_verifier_unittest.cc |
diff --git a/net/cert/multi_threaded_cert_verifier_unittest.cc b/net/cert/multi_threaded_cert_verifier_unittest.cc |
index 4d9e50ee8ea8a8d74ce9995fb9a8862e0b0c0194..b8745d47c15a318032e86db3f5492d4f733ecdda 100644 |
--- a/net/cert/multi_threaded_cert_verifier_unittest.cc |
+++ b/net/cert/multi_threaded_cert_verifier_unittest.cc |
@@ -88,13 +88,14 @@ TEST_F(MultiThreadedCertVerifierTest, InflightJoin) { |
error = verifier_.Verify( |
CertVerifier::RequestParams(test_cert, "www.example.com", 0, |
std::string(), CertificateList()), |
- NULL, &verify_result, callback.callback(), &request, BoundNetLog()); |
+ NULL, &verify_result, callback.callback(), &request, NetLogWithSource()); |
ASSERT_THAT(error, IsError(ERR_IO_PENDING)); |
EXPECT_TRUE(request); |
error = verifier_.Verify( |
CertVerifier::RequestParams(test_cert, "www.example.com", 0, |
std::string(), CertificateList()), |
- NULL, &verify_result2, callback2.callback(), &request2, BoundNetLog()); |
+ NULL, &verify_result2, callback2.callback(), &request2, |
+ NetLogWithSource()); |
EXPECT_THAT(error, IsError(ERR_IO_PENDING)); |
EXPECT_TRUE(request2); |
error = callback.WaitForResult(); |
@@ -119,7 +120,8 @@ TEST_F(MultiThreadedCertVerifierTest, CancelRequest) { |
error = verifier_.Verify( |
CertVerifier::RequestParams(test_cert, "www.example.com", 0, |
std::string(), CertificateList()), |
- NULL, &verify_result, base::Bind(&FailTest), &request, BoundNetLog()); |
+ NULL, &verify_result, base::Bind(&FailTest), &request, |
+ NetLogWithSource()); |
ASSERT_THAT(error, IsError(ERR_IO_PENDING)); |
ASSERT_TRUE(request); |
request.reset(); |
@@ -132,7 +134,8 @@ TEST_F(MultiThreadedCertVerifierTest, CancelRequest) { |
error = verifier_.Verify( |
CertVerifier::RequestParams(test_cert, "www2.example.com", 0, |
std::string(), CertificateList()), |
- NULL, &verify_result, callback.callback(), &request, BoundNetLog()); |
+ NULL, &verify_result, callback.callback(), &request, |
+ NetLogWithSource()); |
ASSERT_THAT(error, IsError(ERR_IO_PENDING)); |
EXPECT_TRUE(request); |
error = callback.WaitForResult(); |
@@ -162,7 +165,8 @@ TEST_F(MultiThreadedCertVerifierTest, CancelRequestThenQuit) { |
error = verifier_.Verify( |
CertVerifier::RequestParams(test_cert, "www.example.com", 0, |
std::string(), CertificateList()), |
- NULL, &verify_result, callback.callback(), &request, BoundNetLog()); |
+ NULL, &verify_result, callback.callback(), &request, |
+ NetLogWithSource()); |
} |
ASSERT_THAT(error, IsError(ERR_IO_PENDING)); |
EXPECT_TRUE(request); |
@@ -203,21 +207,24 @@ TEST_F(MultiThreadedCertVerifierTest, MultipleInflightJoin) { |
error = verifier_.Verify( |
CertVerifier::RequestParams(test_cert, domain2, 0, std::string(), |
CertificateList()), |
- nullptr, &verify_result1, callback1.callback(), &request1, BoundNetLog()); |
+ nullptr, &verify_result1, callback1.callback(), &request1, |
+ NetLogWithSource()); |
ASSERT_THAT(error, IsError(ERR_IO_PENDING)); |
EXPECT_TRUE(request1); |
error = verifier_.Verify( |
CertVerifier::RequestParams(test_cert, domain2, 0, std::string(), |
CertificateList()), |
- nullptr, &verify_result2, callback2.callback(), &request2, BoundNetLog()); |
+ nullptr, &verify_result2, callback2.callback(), &request2, |
+ NetLogWithSource()); |
EXPECT_THAT(error, IsError(ERR_IO_PENDING)); |
EXPECT_TRUE(request2); |
error = verifier_.Verify( |
CertVerifier::RequestParams(test_cert, domain3, 0, std::string(), |
CertificateList()), |
- nullptr, &verify_result3, callback3.callback(), &request3, BoundNetLog()); |
+ nullptr, &verify_result3, callback3.callback(), &request3, |
+ NetLogWithSource()); |
EXPECT_THAT(error, IsError(ERR_IO_PENDING)); |
EXPECT_TRUE(request3); |
@@ -225,14 +232,16 @@ TEST_F(MultiThreadedCertVerifierTest, MultipleInflightJoin) { |
error = verifier_.Verify( |
CertVerifier::RequestParams(test_cert, domain1, 0, std::string(), |
CertificateList()), |
- nullptr, &verify_result4, callback4.callback(), &request4, BoundNetLog()); |
+ nullptr, &verify_result4, callback4.callback(), &request4, |
+ NetLogWithSource()); |
EXPECT_THAT(error, IsError(ERR_IO_PENDING)); |
EXPECT_TRUE(request4); |
error = verifier_.Verify( |
CertVerifier::RequestParams(test_cert, domain2, 0, std::string(), |
CertificateList()), |
- nullptr, &verify_result5, callback5.callback(), &request5, BoundNetLog()); |
+ nullptr, &verify_result5, callback5.callback(), &request5, |
+ NetLogWithSource()); |
EXPECT_THAT(error, IsError(ERR_IO_PENDING)); |
EXPECT_TRUE(request5); |