Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(193)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/cert/multi_threaded_cert_verifier_unittest.cc

Issue 1132103004: Rename variables "request_handle" to "request" in CertVerifier tests. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@cert_refactor
Patch Set: rebase onto master Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/chromeos/policy/policy_cert_verifier_browsertest.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 cb58291e69dbb998d790fc7d820231534c5f9bb8..a3db543f0d7b5db057af046a6361cb11fcc4b175 100644
--- a/net/cert/multi_threaded_cert_verifier_unittest.cc
+++ b/net/cert/multi_threaded_cert_verifier_unittest.cc
@@ -85,13 +85,13 @@ TEST_F(MultiThreadedCertVerifierTest, CacheHit) {
int error;
CertVerifyResult verify_result;
TestCompletionCallback callback;
- scoped_ptr<CertVerifier::Request> request_handle;
+ scoped_ptr<CertVerifier::Request> request;
error = verifier_.Verify(test_cert.get(), "www.example.com", std::string(), 0,
- NULL, &verify_result, callback.callback(),
- &request_handle, BoundNetLog());
+ NULL, &verify_result, callback.callback(), &request,
+ BoundNetLog());
ASSERT_EQ(ERR_IO_PENDING, error);
- EXPECT_TRUE(request_handle);
+ EXPECT_TRUE(request);
error = callback.WaitForResult();
ASSERT_TRUE(IsCertificateError(error));
ASSERT_EQ(1u, verifier_.requests());
@@ -100,12 +100,12 @@ TEST_F(MultiThreadedCertVerifierTest, CacheHit) {
ASSERT_EQ(1u, verifier_.GetCacheSize());
error = verifier_.Verify(test_cert.get(), "www.example.com", std::string(), 0,
- NULL, &verify_result, callback.callback(),
- &request_handle, BoundNetLog());
+ NULL, &verify_result, callback.callback(), &request,
+ BoundNetLog());
// Synchronous completion.
ASSERT_NE(ERR_IO_PENDING, error);
ASSERT_TRUE(IsCertificateError(error));
- ASSERT_TRUE(request_handle == NULL);
+ ASSERT_FALSE(request);
ASSERT_EQ(2u, verifier_.requests());
ASSERT_EQ(1u, verifier_.cache_hits());
ASSERT_EQ(0u, verifier_.inflight_joins());
@@ -145,13 +145,13 @@ TEST_F(MultiThreadedCertVerifierTest, DifferentCACerts) {
int error;
CertVerifyResult verify_result;
TestCompletionCallback callback;
- scoped_ptr<CertVerifier::Request> request_handle;
+ scoped_ptr<CertVerifier::Request> request;
error = verifier_.Verify(cert_chain1.get(), "www.example.com", std::string(),
0, NULL, &verify_result, callback.callback(),
- &request_handle, BoundNetLog());
+ &request, BoundNetLog());
ASSERT_EQ(ERR_IO_PENDING, error);
- EXPECT_TRUE(request_handle);
+ EXPECT_TRUE(request);
error = callback.WaitForResult();
ASSERT_TRUE(IsCertificateError(error));
ASSERT_EQ(1u, verifier_.requests());
@@ -161,9 +161,9 @@ TEST_F(MultiThreadedCertVerifierTest, DifferentCACerts) {
error = verifier_.Verify(cert_chain2.get(), "www.example.com", std::string(),
0, NULL, &verify_result, callback.callback(),
- &request_handle, BoundNetLog());
+ &request, BoundNetLog());
ASSERT_EQ(ERR_IO_PENDING, error);
- EXPECT_TRUE(request_handle);
+ EXPECT_TRUE(request);
error = callback.WaitForResult();
ASSERT_TRUE(IsCertificateError(error));
ASSERT_EQ(2u, verifier_.requests());
@@ -182,21 +182,21 @@ TEST_F(MultiThreadedCertVerifierTest, InflightJoin) {
int error;
CertVerifyResult verify_result;
TestCompletionCallback callback;
- scoped_ptr<CertVerifier::Request> request_handle;
+ scoped_ptr<CertVerifier::Request> request;
CertVerifyResult verify_result2;
TestCompletionCallback callback2;
- scoped_ptr<CertVerifier::Request> request_handle2;
+ scoped_ptr<CertVerifier::Request> request2;
error = verifier_.Verify(test_cert.get(), "www.example.com", std::string(), 0,
- NULL, &verify_result, callback.callback(),
- &request_handle, BoundNetLog());
+ NULL, &verify_result, callback.callback(), &request,
+ BoundNetLog());
ASSERT_EQ(ERR_IO_PENDING, error);
- EXPECT_TRUE(request_handle);
+ EXPECT_TRUE(request);
error = verifier_.Verify(test_cert.get(), "www.example.com", std::string(), 0,
NULL, &verify_result2, callback2.callback(),
- &request_handle2, BoundNetLog());
+ &request2, BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, error);
- EXPECT_TRUE(request_handle2);
+ EXPECT_TRUE(request2);
error = callback.WaitForResult();
EXPECT_TRUE(IsCertificateError(error));
error = callback2.WaitForResult();
@@ -215,14 +215,14 @@ TEST_F(MultiThreadedCertVerifierTest, CancelRequest) {
int error;
CertVerifyResult verify_result;
- scoped_ptr<CertVerifier::Request> request_handle;
+ scoped_ptr<CertVerifier::Request> request;
error = verifier_.Verify(test_cert.get(), "www.example.com", std::string(), 0,
NULL, &verify_result, base::Bind(&FailTest),
- &request_handle, BoundNetLog());
+ &request, BoundNetLog());
ASSERT_EQ(ERR_IO_PENDING, error);
- ASSERT_TRUE(request_handle);
- request_handle.reset();
+ ASSERT_TRUE(request);
+ request.reset();
// Issue a few more requests to the worker pool and wait for their
// completion, so that the task of the canceled request (which runs on a
@@ -231,9 +231,9 @@ TEST_F(MultiThreadedCertVerifierTest, CancelRequest) {
for (int i = 0; i < 5; ++i) {
error = verifier_.Verify(test_cert.get(), "www2.example.com", std::string(),
0, NULL, &verify_result, callback.callback(),
- &request_handle, BoundNetLog());
+ &request, BoundNetLog());
ASSERT_EQ(ERR_IO_PENDING, error);
- EXPECT_TRUE(request_handle);
+ EXPECT_TRUE(request);
error = callback.WaitForResult();
verifier_.ClearCache();
}
@@ -249,7 +249,7 @@ TEST_F(MultiThreadedCertVerifierTest, CancelRequestThenQuit) {
int error;
CertVerifyResult verify_result;
TestCompletionCallback callback;
- scoped_ptr<CertVerifier::Request> request_handle;
+ scoped_ptr<CertVerifier::Request> request;
{
// Because shutdown intentionally doesn't join worker threads, a
@@ -258,11 +258,11 @@ TEST_F(MultiThreadedCertVerifierTest, CancelRequestThenQuit) {
ANNOTATE_SCOPED_MEMORY_LEAK;
error = verifier_.Verify(test_cert.get(), "www.example.com", std::string(),
0, NULL, &verify_result, callback.callback(),
- &request_handle, BoundNetLog());
+ &request, BoundNetLog());
}
ASSERT_EQ(ERR_IO_PENDING, error);
- EXPECT_TRUE(request_handle);
- request_handle.reset();
+ EXPECT_TRUE(request);
+ request.reset();
// Destroy |verifier| by going out of scope.
}
@@ -393,15 +393,15 @@ TEST_F(MultiThreadedCertVerifierTest, CertTrustAnchorProvider) {
int error;
CertVerifyResult verify_result;
TestCompletionCallback callback;
- scoped_ptr<CertVerifier::Request> request_handle;
+ scoped_ptr<CertVerifier::Request> request;
EXPECT_CALL(trust_provider, GetAdditionalTrustAnchors())
.WillOnce(ReturnRef(empty_cert_list));
error = verifier_.Verify(test_cert.get(), "www.example.com", std::string(), 0,
- NULL, &verify_result, callback.callback(),
- &request_handle, BoundNetLog());
+ NULL, &verify_result, callback.callback(), &request,
+ BoundNetLog());
Mock::VerifyAndClearExpectations(&trust_provider);
ASSERT_EQ(ERR_IO_PENDING, error);
- EXPECT_TRUE(request_handle);
+ EXPECT_TRUE(request);
error = callback.WaitForResult();
EXPECT_EQ(ERR_CERT_COMMON_NAME_INVALID, error);
ASSERT_EQ(1u, verifier_.requests());
@@ -411,11 +411,11 @@ TEST_F(MultiThreadedCertVerifierTest, CertTrustAnchorProvider) {
EXPECT_CALL(trust_provider, GetAdditionalTrustAnchors())
.WillOnce(ReturnRef(empty_cert_list));
error = verifier_.Verify(test_cert.get(), "www.example.com", std::string(), 0,
- NULL, &verify_result, callback.callback(),
- &request_handle, BoundNetLog());
+ NULL, &verify_result, callback.callback(), &request,
+ BoundNetLog());
Mock::VerifyAndClearExpectations(&trust_provider);
EXPECT_EQ(ERR_CERT_COMMON_NAME_INVALID, error);
- EXPECT_FALSE(request_handle);
+ EXPECT_FALSE(request);
ASSERT_EQ(2u, verifier_.requests());
ASSERT_EQ(1u, verifier_.cache_hits());
@@ -424,11 +424,11 @@ TEST_F(MultiThreadedCertVerifierTest, CertTrustAnchorProvider) {
EXPECT_CALL(trust_provider, GetAdditionalTrustAnchors())
.WillOnce(ReturnRef(cert_list));
error = verifier_.Verify(test_cert.get(), "www.example.com", std::string(), 0,
- NULL, &verify_result, callback.callback(),
- &request_handle, BoundNetLog());
+ NULL, &verify_result, callback.callback(), &request,
+ BoundNetLog());
Mock::VerifyAndClearExpectations(&trust_provider);
ASSERT_EQ(ERR_IO_PENDING, error);
- EXPECT_TRUE(request_handle);
+ EXPECT_TRUE(request);
error = callback.WaitForResult();
EXPECT_EQ(ERR_CERT_COMMON_NAME_INVALID, error);
ASSERT_EQ(3u, verifier_.requests());
@@ -446,19 +446,19 @@ TEST_F(MultiThreadedCertVerifierTest, MultipleInflightJoin) {
int error;
CertVerifyResult verify_result1;
TestCompletionCallback callback1;
- scoped_ptr<CertVerifier::Request> request_handle1;
+ scoped_ptr<CertVerifier::Request> request1;
CertVerifyResult verify_result2;
TestCompletionCallback callback2;
- scoped_ptr<CertVerifier::Request> request_handle2;
+ scoped_ptr<CertVerifier::Request> request2;
CertVerifyResult verify_result3;
TestCompletionCallback callback3;
- scoped_ptr<CertVerifier::Request> request_handle3;
+ scoped_ptr<CertVerifier::Request> request3;
CertVerifyResult verify_result4;
TestCompletionCallback callback4;
- scoped_ptr<CertVerifier::Request> request_handle4;
+ scoped_ptr<CertVerifier::Request> request4;
CertVerifyResult verify_result5;
TestCompletionCallback callback5;
- scoped_ptr<CertVerifier::Request> request_handle5;
+ scoped_ptr<CertVerifier::Request> request5;
const char domain1[] = "www.example1.com";
const char domain2[] = "www.exampleB.com";
@@ -466,35 +466,35 @@ TEST_F(MultiThreadedCertVerifierTest, MultipleInflightJoin) {
// Start 3 unique requests.
error = verifier_.Verify(test_cert.get(), domain2, std::string(), 0, nullptr,
- &verify_result1, callback1.callback(),
- &request_handle1, BoundNetLog());
+ &verify_result1, callback1.callback(), &request1,
+ BoundNetLog());
ASSERT_EQ(ERR_IO_PENDING, error);
- EXPECT_TRUE(request_handle1);
+ EXPECT_TRUE(request1);
error = verifier_.Verify(test_cert.get(), domain2, std::string(), 0, nullptr,
- &verify_result2, callback2.callback(),
- &request_handle2, BoundNetLog());
+ &verify_result2, callback2.callback(), &request2,
+ BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, error);
- EXPECT_TRUE(request_handle2);
+ EXPECT_TRUE(request2);
error = verifier_.Verify(test_cert.get(), domain3, std::string(), 0, nullptr,
- &verify_result3, callback3.callback(),
- &request_handle3, BoundNetLog());
+ &verify_result3, callback3.callback(), &request3,
+ BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, error);
- EXPECT_TRUE(request_handle3);
+ EXPECT_TRUE(request3);
// Start duplicate requests (which should join to existing jobs).
error = verifier_.Verify(test_cert.get(), domain1, std::string(), 0, nullptr,
- &verify_result4, callback4.callback(),
- &request_handle4, BoundNetLog());
+ &verify_result4, callback4.callback(), &request4,
+ BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, error);
- EXPECT_TRUE(request_handle4);
+ EXPECT_TRUE(request4);
error = verifier_.Verify(test_cert.get(), domain2, std::string(), 0, nullptr,
- &verify_result5, callback5.callback(),
- &request_handle5, BoundNetLog());
+ &verify_result5, callback5.callback(), &request5,
+ BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, error);
- EXPECT_TRUE(request_handle5);
+ EXPECT_TRUE(request5);
error = callback1.WaitForResult();
EXPECT_TRUE(IsCertificateError(error));
« no previous file with comments | « chrome/browser/chromeos/policy/policy_cert_verifier_browsertest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698